X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=include%2Fust-helper.h;h=f16955160b93da0ae76ea477425db132e6d0bd27;hb=c53279a3e7796da67c5ad8d5e5657bf03def2dcb;hp=609a1028642bf946948f9ac10073409c96876d3a;hpb=ddabe860f4cf41a4206a8157d83e6b9354f85cb5;p=lttng-ust.git

diff --git a/include/ust-helper.h b/include/ust-helper.h
index 609a1028..f1695516 100644
--- a/include/ust-helper.h
+++ b/include/ust-helper.h
@@ -9,7 +9,12 @@
 
 #include <stdlib.h>
 
-static inline __attribute__((always_inline))
+#include <lttng/ust-arch.h>
+
+static inline
+void *zmalloc(size_t len)
+	__attribute__((always_inline));
+static inline
 void *zmalloc(size_t len)
 {
 	return calloc(len, 1);
@@ -37,10 +42,10 @@ void *zmalloc(size_t len)
  * architecture for now by always using the NULL value for the ip
  * context.
  */
-#if defined(__PPC__) && !defined(__PPC64__)
+#if defined(LTTNG_UST_ARCH_PPC) && !defined(LTTNG_UST_ARCH_PPC64)
 #define LTTNG_UST_CALLER_IP()		NULL
-#else /* #if defined(__PPC__) && !defined(__PPC64__) */
+#else
 #define LTTNG_UST_CALLER_IP()		__builtin_return_address(0)
-#endif /* #else #if defined(__PPC__) && !defined(__PPC64__) */
+#endif
 
 #endif /* _LTTNG_UST_HELPER_H */