added 2 changesets to branch 'refs/remotes/mmadia-github/separate-build-environment' old head: c71e5e77399bd6127a63434869907d61c198be12 new head: 801d46ec2c481cef601771f271efa0816a4cf081 ---------------------------------------------------------------------------- 6ae0a78: Fixed the defined values. 801d46e: Fix the defined value for _haiku_build_errno. [ Matt Madia <mattmadia@xxxxxxxxx> ] ---------------------------------------------------------------------------- 5 files changed, 20 insertions(+), 20 deletions(-) .../build/os_target/storage/target_StorageDefs.h | 26 ++++++++-------- headers/build/os_target/support/target_Errors.h | 2 +- headers/build/posix_target/sys/target_param.h | 8 ++--- headers/build/posix_target/target_errno.h | 2 +- headers/build/posix_target/target_limits.h | 2 +- ############################################################################ Commit: 6ae0a787e73277ba5a468abf0f1bc2025e78c647 Author: Matt Madia <mattmadia@xxxxxxxxx> Date: Thu Aug 9 01:03:07 2012 UTC Fixed the defined values. ---------------------------------------------------------------------------- diff --git a/headers/build/os_target/storage/target_StorageDefs.h b/headers/build/os_target/storage/target_StorageDefs.h index 00e9ee0..ee01f01 100644 --- a/headers/build/os_target/storage/target_StorageDefs.h +++ b/headers/build/os_target/storage/target_StorageDefs.h @@ -13,21 +13,21 @@ // Limits #define _HAIKU_BUILD_B_DEV_NAME_LENGTH 128 -#define _HAIKU_BUILD_B_FILE_NAME_LENGTH NAME_MAX -#define _HAIKU_BUILD_B_PATH_NAME_LENGTH MAXPATHLEN -#define _HAIKU_BUILD_B_ATTR_NAME_LENGTH (B_FILE_NAME_LENGTH-1) -#define _HAIKU_BUILD_B_MIME_TYPE_LENGTH (B_ATTR_NAME_LENGTH - 15) -#define _HAIKU_BUILD_B_MAX_SYMLINKS SYMLOOP_MAX +#define _HAIKU_BUILD_B_FILE_NAME_LENGTH _HAIKU_BUILD_NAME_MAX +#define _HAIKU_BUILD_B_PATH_NAME_LENGTH _HAIKU_BUILD_MAXPATHLEN +#define _HAIKU_BUILD_B_ATTR_NAME_LENGTH (_HAIKU_BUILD_B_FILE_NAME_LENGTH-1) +#define _HAIKU_BUILD_B_MIME_TYPE_LENGTH (_HAIKU_BUILD_B_ATTR_NAME_LENGTH - 15) +#define _HAIKU_BUILD_B_MAX_SYMLINKS _HAIKU_BUILD_SYMLOOP_MAX // Open Modes -#define _HAIKU_BUILD_B_READ_ONLY O_RDONLY // read only -#define _HAIKU_BUILD_B_WRITE_ONLY O_WRONLY // write only -#define _HAIKU_BUILD_B_READ_WRITE O_RDWR // read and write - -#define _HAIKU_BUILD_B_FAIL_IF_EXISTS O_EXCL // exclusive create -#define _HAIKU_BUILD_B_CREATE_FILE O_CREAT // create the file -#define _HAIKU_BUILD_B_ERASE_FILE O_TRUNC // erase the file's data -#define _HAIKU_BUILD_B_OPEN_AT_END O_APPEND // point to the end of the data +#define _HAIKU_BUILD_B_READ_ONLY _HAIKU_BUILD_O_RDONLY // read only +#define _HAIKU_BUILD_B_WRITE_ONLY _HAIKU_BUILD_O_WRONLY // write only +#define _HAIKU_BUILD_B_READ_WRITE _HAIKU_BUILD_O_RDWR // read and write + +#define _HAIKU_BUILD_B_FAIL_IF_EXISTS _HAIKU_BUILD_O_EXCL // exclusive create +#define _HAIKU_BUILD_B_CREATE_FILE _HAIKU_BUILD_O_CREAT // create the file +#define _HAIKU_BUILD_B_ERASE_FILE _HAIKU_BUILD_O_TRUNC // erase the file's data +#define _HAIKU_BUILD_B_OPEN_AT_END _HAIKU_BUILD_O_APPEND // point to the end of the data #ifndef _HAIKU_BUILD_LIBROOT_FUNCTION_WRAPPER // Limits diff --git a/headers/build/os_target/support/target_Errors.h b/headers/build/os_target/support/target_Errors.h index 2174541..0d71a98 100644 --- a/headers/build/os_target/support/target_Errors.h +++ b/headers/build/os_target/support/target_Errors.h @@ -10,7 +10,7 @@ /* Error baselines */ -#define _HAIKU_BUILD_B_GENERAL_ERROR_BASE _HAIKU_BUILD_INT_MIN +#define _HAIKU_BUILD_B_GENERAL_ERROR_BASE _HAIKU_BUILD_FEATURE_INT_MIN #define _HAIKU_BUILD_B_OS_ERROR_BASE (_HAIKU_BUILD_B_GENERAL_ERROR_BASE + 0x1000) #define _HAIKU_BUILD_B_APP_ERROR_BASE (_HAIKU_BUILD_B_GENERAL_ERROR_BASE + 0x2000) #define _HAIKU_BUILD_B_INTERFACE_ERROR_BASE (_HAIKU_BUILD_B_GENERAL_ERROR_BASE + 0x3000) diff --git a/headers/build/posix_target/sys/target_param.h b/headers/build/posix_target/sys/target_param.h index e848886..83ad137 100644 --- a/headers/build/posix_target/sys/target_param.h +++ b/headers/build/posix_target/sys/target_param.h @@ -9,10 +9,10 @@ #include <target_limits.h> -#define _HAIKU_BUILD_MAXPATHLEN PATH_MAX -#define _HAIKU_BUILD_MAXSYMLINKS SYMLOOP_MAX +#define _HAIKU_BUILD_MAXPATHLEN _HAIKU_BUILD_PATH_MAX +#define _HAIKU_BUILD_MAXSYMLINKS _HAIKU_BUILD_SYMLOOP_MAX -#define _HAIKU_BUILD_NOFILE OPEN_MAX +#define _HAIKU_BUILD_NOFILE _HAIKU_BUILD_OPEN_MAX #ifndef _HAIKU_BUILD_MIN # define _HAIKU_BUILD_MIN(a,b) (((a) < (b)) ? (a) : (b)) @@ -23,7 +23,7 @@ #define _HAIKU_BUILD_ALIGNBYTES (sizeof(long) - 1) #define _HAIKU_BUILD_ALIGN(p) \ - (((u_long)(p) + _ALIGNBYTES) &~ _ALIGNBYTES) + (((u_long)(p) + _ALIGNBYTESALIGNBYTES) &~ _ALIGNBYTESALIGNBYTES) /* maximum possible length of this machine's hostname */ #ifndef _HAIKU_BUILD_MAXHOSTNAMELEN diff --git a/headers/build/posix_target/target_limits.h b/headers/build/posix_target/target_limits.h index aa4415e..b4d266f 100644 --- a/headers/build/posix_target/target_limits.h +++ b/headers/build/posix_target/target_limits.h @@ -63,7 +63,7 @@ #define _HAIKU_BUILD_POSIX_STREAM_MAX (8) #define _HAIKU_BUILD_POSIX_TTY_NAME_MAX (256) #define _HAIKU_BUILD_POSIX_TZNAME_MAX (3) -#define _HAIKU_BUILD_POSIX_SEM_VALUE_MAX _HAIKU_BUILD_INT_MAX +#define _HAIKU_BUILD_POSIX_SEM_VALUE_MAX _HAIKU_BUILD_FEATURE_INT_MAX #define _HAIKU_BUILD_POSIX_SIGQUEUE_MAX 32 #define _HAIKU_BUILD_POSIX_RTSIG_MAX 8 #define _HAIKU_BUILD_POSIX_CLOCKRES_MIN 20000000 ############################################################################ Commit: 801d46ec2c481cef601771f271efa0816a4cf081 Author: Matt Madia <mattmadia@xxxxxxxxx> Date: Thu Aug 9 01:20:41 2012 UTC Fix the defined value for _haiku_build_errno. ---------------------------------------------------------------------------- diff --git a/headers/build/posix_target/target_errno.h b/headers/build/posix_target/target_errno.h index a5074f0..b55c580 100644 --- a/headers/build/posix_target/target_errno.h +++ b/headers/build/posix_target/target_errno.h @@ -17,7 +17,7 @@ extern "C" #define _HAIKU_BUILD_EOK ENOERR /* some code assumes EOK exists */ _HAIKU_BUILD_DECLARE_FUNCTION(int*, _errnop, (void)) -#define _haiku_build_errno (*(_errnop())) +#define _haiku_build_errno (*(_haiku_build__errnop())) #ifndef _HAIKU_BUILD_LIBROOT_FUNCTION_WRAPPER # define ENOERR _HAIKU_BUILD_ENOERR