added 2 changesets to branch 'refs/remotes/mmadia-github/separate-build-environment' old head: da64f2f649f6fc52cee1bb3fbdbbceb6ebe9ed95 new head: d57fcae57a42f03dc84c2409c62f66e0f3555d15 ---------------------------------------------------------------------------- 2a4741c: Implement _HAIKU_BUILD_IDENTIFIER macro d57fcae: Fixed copy/paste errors of #ifndef to #ifdef. [ Matt Madia <mattmadia@xxxxxxxxx> ] ---------------------------------------------------------------------------- 2 files changed, 9 insertions(+), 4 deletions(-) headers/build/HaikuBuild.h | 5 +++++ headers/build/posix_target/sys/target_cdefs.h | 8 ++++---- ############################################################################ Commit: 2a4741c7b53eb30d4205f9dfd5361731600372ac Author: Matt Madia <mattmadia@xxxxxxxxx> Date: Sat Aug 4 07:49:37 2012 UTC Implement _HAIKU_BUILD_IDENTIFIER macro ---------------------------------------------------------------------------- diff --git a/headers/build/HaikuBuild.h b/headers/build/HaikuBuild.h index 73d6aad..8144b06 100644 --- a/headers/build/HaikuBuild.h +++ b/headers/build/HaikuBuild.h @@ -35,5 +35,10 @@ __asm__(_HAIKU_BUILD_ASMNAME("_haiku_build" #name)); #endif +#ifdef _HAIKU_BUILD_LIBROOT_FUNCTION_WRAPPER +# define _HAIKU_BUILD_IDENTIFIER(name) name +#else +# define _HAIKU_BUILD_IDENTIFIER(name) _haiku_build_##name +#endif #endif /* _HAIKU_BUILD_H */ ############################################################################ Commit: d57fcae57a42f03dc84c2409c62f66e0f3555d15 Author: Matt Madia <mattmadia@xxxxxxxxx> Date: Sat Aug 4 07:53:36 2012 UTC Fixed copy/paste errors of #ifndef to #ifdef. ---------------------------------------------------------------------------- diff --git a/headers/build/posix_target/sys/target_cdefs.h b/headers/build/posix_target/sys/target_cdefs.h index def137c..6dc9c53 100644 --- a/headers/build/posix_target/sys/target_cdefs.h +++ b/headers/build/posix_target/sys/target_cdefs.h @@ -34,19 +34,19 @@ #define __HAIKU_BUILD__dead2 #ifndef _HAIKU_BUILD_LIBROOT_FUNCTION_WRAPPER -# ifndef __HAIKU_BUILD__THROW +# ifdef __HAIKU_BUILD__THROW # define __THROW # endif -# ifndef __HAIKU_BUILD__P +# ifdef __HAIKU_BUILD__P # define __P(s) __HAIKU_BUILD__P(s) # endif -# ifndef __HAIKU_BUILD__CONCAT +# ifdef __HAIKU_BUILD__CONCAT # define __CONCAT(x,y) __HAIKU_BUILD__CONCAT(x,y) # endif -# ifndef __HAIKU_BUILD__STRING +# ifdef __HAIKU_BUILD__STRING # define __STRING(x) __HAIKU_BUILD__STRING(x) # endif