[haiku-commits] BRANCH mmadia-github.separate-build-environment - headers/build
- From: mmadia-github.separate-build-environment <community@xxxxxxxxxxxx>
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sat, 4 Aug 2012 17:49:12 +0200 (CEST)
added 1 changeset to branch
'refs/remotes/mmadia-github/separate-build-environment'
old head: d57fcae57a42f03dc84c2409c62f66e0f3555d15
new head: e44e25173dea0d34f3c03096a1156aea4d715b2e
----------------------------------------------------------------------------
e44e251: Fix _HAIKU_BUILD_IDENTIFIER and cleanup the header.
[ Matt Madia <mattmadia@xxxxxxxxx> ]
----------------------------------------------------------------------------
Commit: e44e25173dea0d34f3c03096a1156aea4d715b2e
Author: Matt Madia <mattmadia@xxxxxxxxx>
Date: Sat Aug 4 11:09:18 2012 UTC
----------------------------------------------------------------------------
1 file changed, 3 insertions(+), 12 deletions(-)
headers/build/HaikuBuild.h | 15 +++------------
----------------------------------------------------------------------------
diff --git a/headers/build/HaikuBuild.h b/headers/build/HaikuBuild.h
index 8144b06..b92b4ed 100644
--- a/headers/build/HaikuBuild.h
+++ b/headers/build/HaikuBuild.h
@@ -17,28 +17,19 @@
#ifdef _HAIKU_BUILD_LIBROOT_FUNCTION_WRAPPER
# define _HAIKU_BUILD_DECLARE_FUNCTION(returnValue, name, parameters)
\
returnValue _haiku_build_##name parameters;
+# define _HAIKU_BUILD_DECLARE_CONSTANT(type, name) \
+ extern type _haiku_build##name;
+# define _HAIKU_BUILD_IDENTIFIER(name) _haiku_build_##name
#else
# define _HAIKU_BUILD_DECLARE_FUNCTION(returnValue, name, parameters)
\
returnValue _haiku_build_##name parameters;
\
returnValue name parameters
\
__asm__(_HAIKU_BUILD_ASMNAME("_haiku_build_" #name));
-#endif
-
-// NOTE: #8730 -- _HAIKU_BUILD_DECLARE_CONSTANT is untested.
-#ifdef _HAIKU_BUILD_LIBROOT_FUNCTION_WRAPPER
-# define _HAIKU_BUILD_DECLARE_CONSTANT(type, name) \
- extern type _haiku_build##name;
-#else
# define _HAIKU_BUILD_DECLARE_CONSTANT(type, name) \
extern type _haiku_build##name; \
extern type name \
__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 */
Other related posts:
- » [haiku-commits] BRANCH mmadia-github.separate-build-environment - headers/build - mmadia-github . separate-build-environment
