added 2 changesets to branch 'refs/remotes/mmadia-github/separate-build-environment' old head: e709ec649f015089032c298004410c829e434019 new head: c417bf4bab3a66861dce3674552d915031ce651c ---------------------------------------------------------------------------- 72f6ff8: "Fixed" was to be loosely interpreted. Fixed. This time for real. c417bf4: Fixed the usage of _HAIKU_BUILD_DECLARE_FUNCTION. [ Matt Madia <mattmadia@xxxxxxxxx> ] ---------------------------------------------------------------------------- 2 files changed, 15 insertions(+), 19 deletions(-) headers/build/os_target/support/target_Errors.h | 4 +-- headers/build/posix_target/target_inttypes.h | 30 ++++++++----------- ############################################################################ Commit: 72f6ff86adabb84ecba06fc7147f1a3b960ffa02 Author: Matt Madia <mattmadia@xxxxxxxxx> Date: Sun Aug 5 14:10:48 2012 UTC "Fixed" was to be loosely interpreted. Fixed. This time for real. ---------------------------------------------------------------------------- diff --git a/headers/build/posix_target/target_inttypes.h b/headers/build/posix_target/target_inttypes.h index d9621ca..0094844 100644 --- a/headers/build/posix_target/target_inttypes.h +++ b/headers/build/posix_target/target_inttypes.h @@ -379,23 +379,19 @@ typedef struct { extern "C" { #endif -_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)) */ +_HAIKU_BUILD_DECLARE_FUNCTION(_haiku_build_intmax_t, imaxabs, \ + (_haiku_build_intmax_t num)) +_HAIKU_BUILD_DECLARE_FUNCTION(_HAIKU_BUILD_IDENTIFIER(imaxdiv_t), imaxdiv, \ + (_haiku_build_intmax_t numer, _haiku_build_intmax_t denom)) + +_HAIKU_BUILD_DECLARE_FUNCTION(_haiku_build_intmax_t, strtoimax, \ + (const char *string, char **_end, int base)) +_HAIKU_BUILD_DECLARE_FUNCTION(_haiku_build_uintmax_t, strtoumax, \ + (const char *string, char **_end, int base)) +/* _HAIKU_BUILD_DECLARE_FUNCTION(_haiku_build_intmax_t, wcstoimax, \ + (const __wchar_t *, __wchar_t **, int)) */ +/* _HAIKU_BUILD_DECLARE_FUNCTION(_haiku_build_uintmax_t, wcstoumax, \ + (const __wchar_t *, __wchar_t **, _haiku_build_int)) */ #ifdef __cplusplus ############################################################################ Commit: c417bf4bab3a66861dce3674552d915031ce651c Author: Matt Madia <mattmadia@xxxxxxxxx> Date: Sun Aug 5 14:14:34 2012 UTC Fixed the usage of _HAIKU_BUILD_DECLARE_FUNCTION. ---------------------------------------------------------------------------- diff --git a/headers/build/os_target/support/target_Errors.h b/headers/build/os_target/support/target_Errors.h index 3343636..2174541 100644 --- a/headers/build/os_target/support/target_Errors.h +++ b/headers/build/os_target/support/target_Errors.h @@ -644,8 +644,8 @@ extern "C" { #endif -int _HAIKU_BUILD_DECLARE_FUNCTION(int, to_positive_error, (int error)) -int _HAIKU_BUILD_DECLARE_FUNCTION(int, to_negative_error, (int error)) +_HAIKU_BUILD_DECLARE_FUNCTION(int, to_positive_error, (int error)) +_HAIKU_BUILD_DECLARE_FUNCTION(int, to_negative_error, (int error)) #ifdef __cplusplus }