added 5 changesets to branch 'refs/remotes/mmadia-github/separate-build-environment' old head: b5ba2b149da91e4241c5f9a8d5e7f6d33f844dbd new head: e709ec649f015089032c298004410c829e434019 ---------------------------------------------------------------------------- 842a549: Whitespace cleanup. No functional change. f9061c2: Fixed some typos. 5dc2f02: Updated definitions to use _HAIKU_BUILD_FEATURE_LLONG_[MIN,MAX]. 5d28c4c: Fixed some typos. Originally, I had prefixed some variables with __haiku_build by accident. e709ec6: Fixed the struct imaxdiv_t and related functions. Review appreciated. [ Matt Madia <mattmadia@xxxxxxxxx> ] ---------------------------------------------------------------------------- 3 files changed, 129 insertions(+), 122 deletions(-) headers/build/posix_target/target_inttypes.h | 31 ++-- headers/build/posix_target/target_limits.h | 176 +++++++++++----------- headers/build/posix_target/target_stdint.h | 44 +++--- ############################################################################ Commit: 842a549b20b0f995edcb2c8d16fdc953bc82050f Author: Matt Madia <mattmadia@xxxxxxxxx> Date: Sun Aug 5 12:48:58 2012 UTC Whitespace cleanup. No functional change. ---------------------------------------------------------------------------- diff --git a/headers/build/posix_target/target_limits.h b/headers/build/posix_target/target_limits.h index 4fdf6d4..8fa2948 100644 --- a/headers/build/posix_target/target_limits.h +++ b/headers/build/posix_target/target_limits.h @@ -17,21 +17,21 @@ Get the values via HaikuHostBuildConfig.h */ -#define _HAIKU_BUILD_LONGLONG_MIN (-9223372036854775807LL - 1) /* these are Be specific */ -#define _HAIKU_BUILD_LONGLONG_MAX (9223372036854775807LL) -#define _HAIKU_BUILD_ULONGLONG_MAX (0xffffffffffffffffULL) +#define _HAIKU_BUILD_LONGLONG_MIN (-9223372036854775807LL - 1) /* these are Be specific */ +#define _HAIKU_BUILD_LONGLONG_MAX (9223372036854775807LL) +#define _HAIKU_BUILD_ULONGLONG_MAX (0xffffffffffffffffULL) -#define _HAIKU_BUILD_ULLONG_MAX _HAIKU_BUILDULONGLONG_MAX -#define _HAIKU_BUILD_LLONG_MAX _HAIKU_BUILDLONGLONG_MAX -#define _HAIKU_BUILD_LLONG_MIN _HAIKU_BUILDLONGLONG_MIN +#define _HAIKU_BUILD_ULLONG_MAX _HAIKU_BUILDULONGLONG_MAX +#define _HAIKU_BUILD_LLONG_MAX _HAIKU_BUILDLONGLONG_MAX +#define _HAIKU_BUILD_LLONG_MIN _HAIKU_BUILDLONGLONG_MIN -#define _HAIKU_BUILD_MB_LEN_MAX 16 +#define _HAIKU_BUILD_MB_LEN_MAX 16 -#define _HAIKU_BUILD_OFF_MAX _HAIKU_BUILDLLONG_MAX -#define _HAIKU_BUILD_OFF_MIN _HAIKU_BUILDLLONG_MIN +#define _HAIKU_BUILD_OFF_MAX _HAIKU_BUILDLLONG_MAX +#define _HAIKU_BUILD_OFF_MIN _HAIKU_BUILDLLONG_MIN #define _HAIKU_BUILD_ARG_MAX (32768) -#define _HAIKU_BUILD_ATEXIT_MAX (32) +#define _HAIKU_BUILD_ATEXIT_MAX (32) #define _HAIKU_BUILD_CHILD_MAX (1024) #define _HAIKU_BUILD_IOV_MAX (1024) #define _HAIKU_BUILD_FILESIZEBITS (64) @@ -39,10 +39,10 @@ #define _HAIKU_BUILD_LINE_MAX (2048) #define _HAIKU_BUILD_LINK_MAX (1) #define _HAIKU_BUILD_LOGIN_NAME_MAX (32) -#define _HAIKU_BUILD_MAX_CANON (255) +#define _HAIKU_BUILD_MAX_CANON (255) #define _HAIKU_BUILD_MAX_INPUT (255) #define _HAIKU_BUILD_NAME_MAX (256) -#define _HAIKU_BUILD_NGROUPS_MAX (32) +#define _HAIKU_BUILD_NGROUPS_MAX (32) #define _HAIKU_BUILD_OPEN_MAX (128) #define _HAIKU_BUILD_PAGE_SIZE (4096) #define _HAIKU_BUILD_PAGESIZE (4096) @@ -50,28 +50,28 @@ #define _HAIKU_BUILD_PIPE_MAX (512) #define _HAIKU_BUILD_PTHREAD_KEYS_MAX 256 #define _HAIKU_BUILD_PTHREAD_STACK_MIN 4096 -#define _HAIKU_BUILD_SSIZE_MAX _HAIKU_BUILD__HAIKU_SADDR_MAX +#define _HAIKU_BUILD_SSIZE_MAX _HAIKU_BUILD__HAIKU_SADDR_MAX #define _HAIKU_BUILD_TTY_NAME_MAX (256) -#define _HAIKU_BUILD_TZNAME_MAX (32) +#define _HAIKU_BUILD_TZNAME_MAX (32) #define _HAIKU_BUILD_SYMLINK_MAX (1024) #define _HAIKU_BUILD_SYMLOOP_MAX (16) -#define _HAIKU_BUILD_POSIX_ARG_MAX (32768) +#define _HAIKU_BUILD_POSIX_ARG_MAX (32768) #define _HAIKU_BUILD_POSIX_CHILD_MAX (1024) #define _HAIKU_BUILD_POSIX_HOST_NAME_MAX (255) -#define _HAIKU_BUILD_POSIX_LINK_MAX (1) +#define _HAIKU_BUILD_POSIX_LINK_MAX (1) #define _HAIKU_BUILD_POSIX_LOGIN_NAME_MAX (9) #define _HAIKU_BUILD_POSIX_MAX_CANON (255) #define _HAIKU_BUILD_POSIX_MAX_INPUT (255) -#define _HAIKU_BUILD_POSIX_NAME_MAX (255) -#define _HAIKU_BUILD_POSIX_NGROUPS_MAX (8) -#define _HAIKU_BUILD_POSIX_OPEN_MAX (128) -#define _HAIKU_BUILD_POSIX_PATH_MAX (1024) -#define _HAIKU_BUILD_POSIX_PIPE_BUF (512) +#define _HAIKU_BUILD_POSIX_NAME_MAX (255) +#define _HAIKU_BUILD_POSIX_NGROUPS_MAX (8) +#define _HAIKU_BUILD_POSIX_OPEN_MAX (128) +#define _HAIKU_BUILD_POSIX_PATH_MAX (1024) +#define _HAIKU_BUILD_POSIX_PIPE_BUF (512) #define _HAIKU_BUILD_POSIX_SSIZE_MAX _HAIKU_BUILD__HAIKU_SADDR_MAX -#define _HAIKU_BUILD_POSIX_STREAM_MAX (8) +#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_TZNAME_MAX (3) #define _HAIKU_BUILD_POSIX_SEM_VALUE_MAX _HAIKU_BUILDINT_MAX #define _HAIKU_BUILD_POSIX_SIGQUEUE_MAX 32 #define _HAIKU_BUILD_POSIX_RTSIG_MAX 8 @@ -82,69 +82,69 @@ #define _HAIKU_BUILD_POSIX2_LINE_MAX (2048) #ifndef _HAIKU_BUILD_LIBROOT_FUNCTION_WRAPPER -# define LONGLONG_MIN _HAIKU_BUILD_LONGLONG_MIN -# define LONGLONG_MAX _HAIKU_BUILD_LONGLONG_MAX -# define ULONGLONG_MAX _HAIKU_BUILD_ULONGLONG_MAX - -# define ULLONG_MAX _HAIKU_BUILD_ULLONG_MAX -# define LLONG_MAX _HAIKU_BUILD_LLONG_MAX -# define LLONG_MIN _HAIKU_BUILD_LLONG_MIN - -# define MB_LEN_MAX _HAIKU_BUILD_MB_LEN_MAX - -# define OFF_MAX _HAIKU_BUILD_OFF_MAX -# define OFF_MIN _HAIKU_BUILD_OFF_MIN - -# define ARG_MAX _HAIKU_BUILD_ARG_MAX -# define ATEXIT_MAX _HAIKU_BUILD_ATEXIT_MAX -# define CHILD_MAX _HAIKU_BUILD_CHILD_MAX -# define IOV_MAX _HAIKU_BUILD_IOV_MAX -# define FILESIZEBITS _HAIKU_BUILD_FILESIZEBITS -# define HOST_NAME_MAX _HAIKU_BUILD_HOST_NAME_MAX -# define LINE_MAX _HAIKU_BUILD_LINE_MAX -# define LINK_MAX _HAIKU_BUILD_LINK_MAX -# define LOGIN_NAME_MAX _HAIKU_BUILD_LOGIN_NAME_MAX -# define MAX_CANON _HAIKU_BUILD_MAX_CANON -# define MAX_INPUT _HAIKU_BUILD_MAX_INPUT -# define NAME_MAX _HAIKU_BUILD_NAME_MAX -# define NGROUPS_MAX _HAIKU_BUILD_NGROUPS_MAX -# define OPEN_MAX _HAIKU_BUILD_OPEN_MAX -# define PAGE_SIZE _HAIKU_BUILD_PAGE_SIZE -# define PAGESIZE _HAIKU_BUILD_PAGESIZE -# define PATH_MAX _HAIKU_BUILD_PATH_MAX -# define PIPE_MAX _HAIKU_BUILD_PIPE_MAX -# define PTHREAD_KEYS_MAX _HAIKU_BUILD_PTHREAD_KEYS_MAX -# define PTHREAD_STACK_MIN _HAIKU_BUILD_PTHREAD_STACK_MIN -# define SSIZE_MAX _HAIKU_BUILD_SSIZE_MAX -# define TTY_NAME_MAX _HAIKU_BUILD_TTY_NAME_MAX -# define TZNAME_MAX _HAIKU_BUILD_TZNAME_MAX -# define SYMLINK_MAX _HAIKU_BUILD_SYMLINK_MAX -# define SYMLOOP_MAX _HAIKU_BUILD_SYMLOOP_MAX - -# define _POSIX_ARG_MAX _HAIKU_BUILD_POSIX_ARG_MAX -# define _POSIX_CHILD_MAX _HAIKU_BUILD_POSIX_CHILD_MAX -# define _POSIX_HOST_NAME_MAX _HAIKU_BUILD_POSIX_HOST_NAME_MAX -# define _POSIX_LINK_MAX _HAIKU_BUILD_POSIX_LINK_MAX -# define _POSIX_LOGIN_NAME_MAX _HAIKU_BUILD_POSIX_LOGIN_NAME_MAX -# define _POSIX_MAX_CANON _HAIKU_BUILD_POSIX_MAX_CANON -# define _POSIX_MAX_INPUT _HAIKU_BUILD_POSIX_MAX_INPUT -# define _POSIX_NAME_MAX _HAIKU_BUILD_POSIX_NAME_MAX -# define _POSIX_NGROUPS_MAX _HAIKU_BUILD_POSIX_NGROUPS_MAX -# define _POSIX_OPEN_MAX _HAIKU_BUILD_POSIX_OPEN_MAX -# define _POSIX_PATH_MAX _HAIKU_BUILD_POSIX_PATH_MAX -# define _POSIX_PIPE_BUF _HAIKU_BUILD_POSIX_PIPE_BUF -# define _POSIX_SSIZE_MAX _HAIKU_BUILD_POSIX_SSIZE_MAX -# define _POSIX_STREAM_MAX _HAIKU_BUILD_POSIX_STREAM_MAX -# define _POSIX_TTY_NAME_MAX _HAIKU_BUILD_POSIX_TTY_NAME_MAX -# define _POSIX_TZNAME_MAX _HAIKU_BUILD_POSIX_TZNAME_MAX -# define _POSIX_SEM_VALUE_MAX _HAIKU_BUILD_POSIX_SEM_VALUE_MAX -# define _POSIX_SIGQUEUE_MAX _HAIKU_BUILD_POSIX_SIGQUEUE_MAX -# define _POSIX_RTSIG_MAX _HAIKU_BUILD_POSIX_RTSIG_MAX -# define _POSIX_CLOCKRES_MIN _HAIKU_BUILD_POSIX_CLOCKRES_MIN -# define _POSIX_TIMER_MAX _HAIKU_BUILD_POSIX_TIMER_MAX -# define _POSIX_DELAYTIMER_MAX _HAIKU_BUILD_POSIX_DELAYTIMER_MAX - -# define _POSIX2_LINE_MAX _HAIKU_BUILD_POSIX2_LINE_MAX +# define LONGLONG_MIN _HAIKU_BUILD_LONGLONG_MIN +# define LONGLONG_MAX _HAIKU_BUILD_LONGLONG_MAX +# define ULONGLONG_MAX _HAIKU_BUILD_ULONGLONG_MAX + +# define ULLONG_MAX _HAIKU_BUILD_ULLONG_MAX +# define LLONG_MAX _HAIKU_BUILD_LLONG_MAX +# define LLONG_MIN _HAIKU_BUILD_LLONG_MIN + +# define MB_LEN_MAX _HAIKU_BUILD_MB_LEN_MAX + +# define OFF_MAX _HAIKU_BUILD_OFF_MAX +# define OFF_MIN _HAIKU_BUILD_OFF_MIN + +# define ARG_MAX _HAIKU_BUILD_ARG_MAX +# define ATEXIT_MAX _HAIKU_BUILD_ATEXIT_MAX +# define CHILD_MAX _HAIKU_BUILD_CHILD_MAX +# define IOV_MAX _HAIKU_BUILD_IOV_MAX +# define FILESIZEBITS _HAIKU_BUILD_FILESIZEBITS +# define HOST_NAME_MAX _HAIKU_BUILD_HOST_NAME_MAX +# define LINE_MAX _HAIKU_BUILD_LINE_MAX +# define LINK_MAX _HAIKU_BUILD_LINK_MAX +# define LOGIN_NAME_MAX _HAIKU_BUILD_LOGIN_NAME_MAX +# define MAX_CANON _HAIKU_BUILD_MAX_CANON +# define MAX_INPUT _HAIKU_BUILD_MAX_INPUT +# define NAME_MAX _HAIKU_BUILD_NAME_MAX +# define NGROUPS_MAX _HAIKU_BUILD_NGROUPS_MAX +# define OPEN_MAX _HAIKU_BUILD_OPEN_MAX +# define PAGE_SIZE _HAIKU_BUILD_PAGE_SIZE +# define PAGESIZE _HAIKU_BUILD_PAGESIZE +# define PATH_MAX _HAIKU_BUILD_PATH_MAX +# define PIPE_MAX _HAIKU_BUILD_PIPE_MAX +# define PTHREAD_KEYS_MAX _HAIKU_BUILD_PTHREAD_KEYS_MAX +# define PTHREAD_STACK_MIN _HAIKU_BUILD_PTHREAD_STACK_MIN +# define SSIZE_MAX _HAIKU_BUILD_SSIZE_MAX +# define TTY_NAME_MAX _HAIKU_BUILD_TTY_NAME_MAX +# define TZNAME_MAX _HAIKU_BUILD_TZNAME_MAX +# define SYMLINK_MAX _HAIKU_BUILD_SYMLINK_MAX +# define SYMLOOP_MAX _HAIKU_BUILD_SYMLOOP_MAX + +# define _POSIX_ARG_MAX _HAIKU_BUILD_POSIX_ARG_MAX +# define _POSIX_CHILD_MAX _HAIKU_BUILD_POSIX_CHILD_MAX +# define _POSIX_HOST_NAME_MAX _HAIKU_BUILD_POSIX_HOST_NAME_MAX +# define _POSIX_LINK_MAX _HAIKU_BUILD_POSIX_LINK_MAX +# define _POSIX_LOGIN_NAME_MAX _HAIKU_BUILD_POSIX_LOGIN_NAME_MAX +# define _POSIX_MAX_CANON _HAIKU_BUILD_POSIX_MAX_CANON +# define _POSIX_MAX_INPUT _HAIKU_BUILD_POSIX_MAX_INPUT +# define _POSIX_NAME_MAX _HAIKU_BUILD_POSIX_NAME_MAX +# define _POSIX_NGROUPS_MAX _HAIKU_BUILD_POSIX_NGROUPS_MAX +# define _POSIX_OPEN_MAX _HAIKU_BUILD_POSIX_OPEN_MAX +# define _POSIX_PATH_MAX _HAIKU_BUILD_POSIX_PATH_MAX +# define _POSIX_PIPE_BUF _HAIKU_BUILD_POSIX_PIPE_BUF +# define _POSIX_SSIZE_MAX _HAIKU_BUILD_POSIX_SSIZE_MAX +# define _POSIX_STREAM_MAX _HAIKU_BUILD_POSIX_STREAM_MAX +# define _POSIX_TTY_NAME_MAX _HAIKU_BUILD_POSIX_TTY_NAME_MAX +# define _POSIX_TZNAME_MAX _HAIKU_BUILD_POSIX_TZNAME_MAX +# define _POSIX_SEM_VALUE_MAX _HAIKU_BUILD_POSIX_SEM_VALUE_MAX +# define _POSIX_SIGQUEUE_MAX _HAIKU_BUILD_POSIX_SIGQUEUE_MAX +# define _POSIX_RTSIG_MAX _HAIKU_BUILD_POSIX_RTSIG_MAX +# define _POSIX_CLOCKRES_MIN _HAIKU_BUILD_POSIX_CLOCKRES_MIN +# define _POSIX_TIMER_MAX _HAIKU_BUILD_POSIX_TIMER_MAX +# define _POSIX_DELAYTIMER_MAX _HAIKU_BUILD_POSIX_DELAYTIMER_MAX + +# define _POSIX2_LINE_MAX _HAIKU_BUILD_POSIX2_LINE_MAX #endif #endif /* _LIBC_LIMITS_H_ */ ############################################################################ Commit: f9061c27b38c030cf28e4677d5fef7cd0e3ed678 Author: Matt Madia <mattmadia@xxxxxxxxx> Date: Sun Aug 5 12:53:47 2012 UTC Fixed some typos. ---------------------------------------------------------------------------- diff --git a/headers/build/posix_target/target_limits.h b/headers/build/posix_target/target_limits.h index 8fa2948..249fb9a 100644 --- a/headers/build/posix_target/target_limits.h +++ b/headers/build/posix_target/target_limits.h @@ -21,14 +21,14 @@ #define _HAIKU_BUILD_LONGLONG_MAX (9223372036854775807LL) #define _HAIKU_BUILD_ULONGLONG_MAX (0xffffffffffffffffULL) -#define _HAIKU_BUILD_ULLONG_MAX _HAIKU_BUILDULONGLONG_MAX -#define _HAIKU_BUILD_LLONG_MAX _HAIKU_BUILDLONGLONG_MAX -#define _HAIKU_BUILD_LLONG_MIN _HAIKU_BUILDLONGLONG_MIN +#define _HAIKU_BUILD_ULLONG_MAX _HAIKU_BUILD_ULONGLONG_MAX +#define _HAIKU_BUILD_LLONG_MAX _HAIKU_BUILD_LONGLONG_MAX +#define _HAIKU_BUILD_LLONG_MIN _HAIKU_BUILD_LONGLONG_MIN #define _HAIKU_BUILD_MB_LEN_MAX 16 -#define _HAIKU_BUILD_OFF_MAX _HAIKU_BUILDLLONG_MAX -#define _HAIKU_BUILD_OFF_MIN _HAIKU_BUILDLLONG_MIN +#define _HAIKU_BUILD_OFF_MAX _HAIKU_BUILD_LLONG_MAX +#define _HAIKU_BUILD_OFF_MIN _HAIKU_BUILD_LLONG_MIN #define _HAIKU_BUILD_ARG_MAX (32768) #define _HAIKU_BUILD_ATEXIT_MAX (32) @@ -50,7 +50,7 @@ #define _HAIKU_BUILD_PIPE_MAX (512) #define _HAIKU_BUILD_PTHREAD_KEYS_MAX 256 #define _HAIKU_BUILD_PTHREAD_STACK_MIN 4096 -#define _HAIKU_BUILD_SSIZE_MAX _HAIKU_BUILD__HAIKU_SADDR_MAX +#define _HAIKU_BUILD_SSIZE_MAX __HAIKU_BUILD_HAIKU_SADDR_MAX #define _HAIKU_BUILD_TTY_NAME_MAX (256) #define _HAIKU_BUILD_TZNAME_MAX (32) #define _HAIKU_BUILD_SYMLINK_MAX (1024) @@ -68,11 +68,11 @@ #define _HAIKU_BUILD_POSIX_OPEN_MAX (128) #define _HAIKU_BUILD_POSIX_PATH_MAX (1024) #define _HAIKU_BUILD_POSIX_PIPE_BUF (512) -#define _HAIKU_BUILD_POSIX_SSIZE_MAX _HAIKU_BUILD__HAIKU_SADDR_MAX +#define _HAIKU_BUILD_POSIX_SSIZE_MAX __HAIKU_BUILD_HAIKU_SADDR_MAX #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_BUILDINT_MAX +#define _HAIKU_BUILD_POSIX_SEM_VALUE_MAX _HAIKU_BUILD_INT_MAX #define _HAIKU_BUILD_POSIX_SIGQUEUE_MAX 32 #define _HAIKU_BUILD_POSIX_RTSIG_MAX 8 #define _HAIKU_BUILD_POSIX_CLOCKRES_MIN 20000000 ############################################################################ Commit: 5dc2f02d69033b60c3afee44df89d81a5ecdb5c2 Author: Matt Madia <mattmadia@xxxxxxxxx> Date: Sun Aug 5 12:55:18 2012 UTC Updated definitions to use _HAIKU_BUILD_FEATURE_LLONG_[MIN,MAX]. ---------------------------------------------------------------------------- diff --git a/headers/build/posix_target/target_limits.h b/headers/build/posix_target/target_limits.h index 249fb9a..2b8da1f 100644 --- a/headers/build/posix_target/target_limits.h +++ b/headers/build/posix_target/target_limits.h @@ -17,8 +17,8 @@ Get the values via HaikuHostBuildConfig.h */ -#define _HAIKU_BUILD_LONGLONG_MIN (-9223372036854775807LL - 1) /* these are Be specific */ -#define _HAIKU_BUILD_LONGLONG_MAX (9223372036854775807LL) +#define _HAIKU_BUILD_LONGLONG_MIN _HAIKU_BUILD_FEATURE_LLONG_MIN +#define _HAIKU_BUILD_LONGLONG_MAX _HAIKU_BUILD_FEATURE_LLONG_MAX #define _HAIKU_BUILD_ULONGLONG_MAX (0xffffffffffffffffULL) #define _HAIKU_BUILD_ULLONG_MAX _HAIKU_BUILD_ULONGLONG_MAX ############################################################################ Commit: 5d28c4c7437eb2a699f55fcc16cfc215cb42465f Author: Matt Madia <mattmadia@xxxxxxxxx> Date: Sun Aug 5 13:09:46 2012 UTC Fixed some typos. Originally, I had prefixed some variables with __haiku_build by accident. ---------------------------------------------------------------------------- diff --git a/headers/build/posix_target/target_stdint.h b/headers/build/posix_target/target_stdint.h index 07d3b00..dbab812 100644 --- a/headers/build/posix_target/target_stdint.h +++ b/headers/build/posix_target/target_stdint.h @@ -23,38 +23,38 @@ typedef __haiku_build_haiku_std_int64 _haiku_build_int64_t; typedef __haiku_build_haiku_std_uint64 _haiku_build_uint64_t; /* Minimum-width integer types */ -typedef __haiku_build_int8_t _haiku_build_int_least8_t; -typedef __haiku_build_uint8_t _haiku_build_uint_least8_t; +typedef _haiku_build_int8_t _haiku_build_int_least8_t; +typedef _haiku_build_uint8_t _haiku_build_uint_least8_t; -typedef __haiku_build_int16_t _haiku_build_int_least16_t; -typedef __haiku_build_uint16_t _haiku_build_uint_least16_t; +typedef _haiku_build_int16_t _haiku_build_int_least16_t; +typedef _haiku_build_uint16_t _haiku_build_uint_least16_t; -typedef __haiku_build_int32_t _haiku_build_int_least32_t; -typedef __haiku_build_uint32_t _haiku_build_uint_least32_t; +typedef _haiku_build_int32_t _haiku_build_int_least32_t; +typedef _haiku_build_uint32_t _haiku_build_uint_least32_t; -typedef __haiku_build_int64_t _haiku_build_int_least64_t; -typedef __haiku_build_uint64_t _haiku_build_uint_least64_t; +typedef _haiku_build_int64_t _haiku_build_int_least64_t; +typedef _haiku_build_uint64_t _haiku_build_uint_least64_t; /* Fastest minimum-width integer types */ -typedef __haiku_build_int32_t _haiku_build_int_fast8_t; -typedef __haiku_build_uint32_t _haiku_build_uint_fast8_t; +typedef _haiku_build_int32_t _haiku_build_int_fast8_t; +typedef _haiku_build_uint32_t _haiku_build_uint_fast8_t; -typedef __haiku_build_int32_t _haiku_build_int_fast16_t; -typedef __haiku_build_uint32_t _haiku_build_uint_fast16_t; +typedef _haiku_build_int32_t _haiku_build_int_fast16_t; +typedef _haiku_build_uint32_t _haiku_build_uint_fast16_t; -typedef __haiku_build_int32_t _haiku_build_int_fast32_t; -typedef __haiku_build_uint32_t _haiku_build_uint_fast32_t; +typedef _haiku_build_int32_t _haiku_build_int_fast32_t; +typedef _haiku_build_uint32_t _haiku_build_uint_fast32_t; -typedef __haiku_build_int64_t _haiku_build_int_fast64_t; -typedef __haiku_build_uint64_t _haiku_build_uint_fast64_t; +typedef _haiku_build_int64_t _haiku_build_int_fast64_t; +typedef _haiku_build_uint64_t _haiku_build_uint_fast64_t; /* Integer types capable of holding object pointers */ typedef __haiku_build_haiku_saddr_t _haiku_build_intptr_t; typedef __haiku_build_haiku_addr_t _haiku_build_uintptr_t; /* Greatest-width integer types */ -typedef __haiku_build_int64_t _haiku_build_intmax_t; -typedef __haiku_build_uint64_t _haiku_build_uintmax_t; +typedef _haiku_build_int64_t _haiku_build_intmax_t; +typedef _haiku_build_uint64_t _haiku_build_uintmax_t; /* Limits of exact-width integer types */ #define _HAIKU_BUILD_INT8_MIN (-128) @@ -151,10 +151,10 @@ typedef __haiku_build_uint64_t _haiku_build_uintmax_t; /* BSD compatibility */ -typedef __haiku_build_uint8_t u_int8_t; -typedef __haiku_build_uint16_t u_int16_t; -typedef __haiku_build_uint32_t u_int32_t; -typedef __haiku_build_uint64_t u_int64_t; +typedef _haiku_build_uint8_t u_int8_t; +typedef _haiku_build_uint16_t u_int16_t; +typedef _haiku_build_uint32_t u_int32_t; +typedef _haiku_build_uint64_t u_int64_t; #ifndef _HAIKU_BUILD_LIBROOT_FUNCTION_WRAPPER /* Exact-width integer types */ ############################################################################ Commit: e709ec649f015089032c298004410c829e434019 Author: Matt Madia <mattmadia@xxxxxxxxx> Date: Sun Aug 5 13:37:12 2012 UTC Fixed the struct imaxdiv_t and related functions. Review appreciated. ---------------------------------------------------------------------------- diff --git a/headers/build/posix_target/target_inttypes.h b/headers/build/posix_target/target_inttypes.h index 2bb86ae..d9621ca 100644 --- a/headers/build/posix_target/target_inttypes.h +++ b/headers/build/posix_target/target_inttypes.h @@ -9,8 +9,8 @@ #include <target_stdint.h> typedef struct { - intmax_t _HAIKU_BUILD_IDENTIFIER(quot); /* quotient */ - intmax_t _HAIKU_BUILD_IDENTIFIER(rem); /* remainder */ + _haiku_build_intmax_t quot; /* quotient */ + _haiku_build_intmax_t rem; /* remainder */ } _HAIKU_BUILD_IDENTIFIER(imaxdiv_t); // NOTE: #8730 does __STDC_FORMAT_MACROS need to be _HAIKU_BUILD_ prefixed? @@ -379,16 +379,23 @@ typedef struct { extern "C" { #endif -intmax_t _HAIKU_BUILD_DECLARE_FUNCTION(intmax_t, imaxabs, (intmax_t num)) -imaxdiv_t _HAIKU_BUILD_DECLARE_FUNCTION(imaxdiv_t, imaxdiv, \ - (intmax_t numer, intmax_t denom)) - -intmax_t _HAIKU_BUILD_DECLARE_FUNCTION(intmax_t, strtoimax, \ - (const char *string, char **_end, int base)) -uintmax_t _HAIKU_BUILD_DECLARE_FUNCTION(uintmax_t, strtoumax, \ - (const char *string, char **_end, int base)) -/* intmax_t _HAIKU_BUILD_DECLARE_FUNCTION(intmax_t, wcstoimax, (const __wchar_t *, __wchar_t **, int)) */ -/* uintmax_t _HAIKU_BUILD_DECLARE_FUNCTION(uintmax_t, wcstoumax, (const __wchar_t *, __wchar_t **, int)) */ +_haiku_build_intmax_t _HAIKU_BUILD_DECLARE_FUNCTION(_haiku_build_intmax_t, \ + imaxabs, (_haiku_build_intmax_t num)) +_HAIKU_BUILD_IDENTIFIER(imaxdiv_t) _HAIKU_BUILD_DECLARE_FUNCTION(\ + _HAIKU_BUILD_IDENTIFIER(imaxdiv_t), _haiku_build_imaxdiv, \ + (_haiku_build_intmax_t numer, _haiku_build_intmax_t denom)) + +_haiku_build_intmax_t _HAIKU_BUILD_DECLARE_FUNCTION(_haiku_build_intmax_t, \ + strtoimax, (const _haiku_build_char *string, _haiku_build_char **_end, \ + _haiku_build_int base)) +_haiku_build_uintmax_t _HAIKU_BUILD_DECLARE_FUNCTION(\ + _haiku_build_uintmax_t, strtoumax, (const _haiku_build_char *string, \ + _haiku_build_char **_end, _haiku_build_int base)) +// NOTE: these commented functions may not be updated 100% correctly. +/* _haiku_build_intmax_t _HAIKU_BUILD_DECLARE_FUNCTION(_haiku_build_intmax_t, \ + wcstoimax, (const __wchar_t *, __wchar_t **, _haiku_build_int)) */ +/* _haiku_build_uintmax_t _HAIKU_BUILD_DECLARE_FUNCTION(_haiku_build_uintmax_t, \ + wcstoumax, (const __wchar_t *, __wchar_t **, _haiku_build_int)) */ #ifdef __cplusplus