From d1456cc2de8d8107124e4fddabe8cef63f7396b5 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Wed, 25 Nov 2009 21:21:58 +0000 Subject: [PATCH] Added new [FSSH]_B_HAIKU_{32,64}_BIT macros. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@34256 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/private/fs_shell/fssh_api_wrapper.h | 8 ++++++++ headers/private/fs_shell/fssh_defs.h | 22 ++++++++++++++------- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/headers/private/fs_shell/fssh_api_wrapper.h b/headers/private/fs_shell/fssh_api_wrapper.h index 2e583f3da2..ea5f577116 100644 --- a/headers/private/fs_shell/fssh_api_wrapper.h +++ b/headers/private/fs_shell/fssh_api_wrapper.h @@ -127,6 +127,14 @@ //////////////////////////////////////////////////////////////////////////////// // #pragma mark - fssh_defs.h +// 32/64 bitness +#ifdef FSSH_B_HAIKU_64_BIT +# define B_HAIKU_64_BIT FSSH_B_HAIKU_64_BIT +#endif +#ifdef FSSH_B_HAIKU_32_BIT +# define B_HAIKU_32_BIT FSSH_B_HAIKU_32_BIT +#endif + // Limits #define B_DEV_NAME_LENGTH FSSH_B_DEV_NAME_LENGTH #define B_FILE_NAME_LENGTH FSSH_B_FILE_NAME_LENGTH diff --git a/headers/private/fs_shell/fssh_defs.h b/headers/private/fs_shell/fssh_defs.h index badc20486f..f57573d257 100644 --- a/headers/private/fs_shell/fssh_defs.h +++ b/headers/private/fs_shell/fssh_defs.h @@ -1,13 +1,21 @@ /* - * Copyright 2007, Ingo Weinhold, bonefish@cs.tu-berlin.de. + * Copyright 2007-2009, Ingo Weinhold, bonefish@cs.tu-berlin.de. * Distributed under the terms of the MIT License. */ #ifndef _FSSH_DEFS_H #define _FSSH_DEFS_H + #include "fssh_types.h" +// 32/64 bitness +#ifdef HAIKU_HOST_PLATFORM_64_BIT +# define FSSH_B_HAIKU_64_BIT 1 +#else +# define FSSH_B_HAIKU_32_BIT 1 +#endif + // Limits #define FSSH_B_DEV_NAME_LENGTH 128 #define FSSH_B_FILE_NAME_LENGTH 256 @@ -17,14 +25,14 @@ #define FSSH_B_MAX_SYMLINKS 16 // Open Modes -#define FSSH_B_READ_ONLY FSSH_O_RDONLY // read only -#define FSSH_B_WRITE_ONLY FSSH_O_WRONLY // write only +#define FSSH_B_READ_ONLY FSSH_O_RDONLY // read only +#define FSSH_B_WRITE_ONLY FSSH_O_WRONLY // write only #define FSSH_B_READ_WRITE FSSH_O_RDWR // read and write -#define FSSH_B_FAIL_IF_EXISTS FSSH_O_EXCL // exclusive create -#define FSSH_B_CREATE_FILE FSSH_O_CREAT // create the file -#define FSSH_B_ERASE_FILE FSSH_O_TRUNC // erase the file's data -#define FSSH_B_OPEN_AT_END FSSH_O_APPEND // point to the end of the data +#define FSSH_B_FAIL_IF_EXISTS FSSH_O_EXCL // exclusive create +#define FSSH_B_CREATE_FILE FSSH_O_CREAT // create the file +#define FSSH_B_ERASE_FILE FSSH_O_TRUNC // erase the file's data +#define FSSH_B_OPEN_AT_END FSSH_O_APPEND // point to the end of the data // Node Flavors enum fssh_node_flavor {