Centralize arch detection in a public header

[lttng-ust.git] / include / ust-helper.h

diff --git a/include/ust-helper.h b/include/ust-helper.h
index e529ba08bc5f2bd0e101e8dbdf5228eba62dd39d..e8b393a8114df6333bb6fb4bb6832819cd41c551 100644 (file)
--- a/include/ust-helper.h
+++ b/include/ust-helper.h
@@ -9,6 +9,8 @@
 
 #include <stdlib.h>
 
+#include <lttng/ust-arch.h>
+
 static inline __attribute__((always_inline))
 void *zmalloc(size_t len)
 {
@@ -37,21 +39,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__) */
-#define LTTNG_UST_CALLER_IP()          __builtin_return_address(0)
-#endif /* #else #if defined(__PPC__) && !defined(__PPC64__) */
-
-/*
- * LTTNG_HIDDEN: set the hidden attribute for internal functions
- * On Windows, symbols are local unless explicitly exported,
- * see https://gcc.gnu.org/wiki/Visibility
- */
-#if defined(_WIN32) || defined(__CYGWIN__)
-#define LTTNG_HIDDEN
 #else
-#define LTTNG_HIDDEN __attribute__((visibility("hidden")))
+#define LTTNG_UST_CALLER_IP()          __builtin_return_address(0)
 #endif
 
 #endif /* _LTTNG_UST_HELPER_H */