X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fmacros.h;h=97faf03280925fc3503a9ddb6d348093c07c1501;hb=ca806b0b247f89c62ac628a7779ae84049a8c2d7;hp=53f5f96c752061448a6f5d1fc629166db2f345a3;hpb=0c6349626e82044473ea0b3f1ff5456d9a0cd53f;p=lttng-tools.git

diff --git a/src/common/macros.h b/src/common/macros.h
index 53f5f96c7..97faf0328 100644
--- a/src/common/macros.h
+++ b/src/common/macros.h
@@ -93,20 +93,9 @@ void *zmalloc(size_t len)
  */
 #define ALIGN_TO(value, align) ((value + (align - 1)) & ~(align - 1))
 
-/*
- * 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")))
-#endif
-
 #define member_sizeof(type, field)	sizeof(((type *) 0)->field)
 
-#define ASSERT_LOCKED(lock) assert(pthread_mutex_trylock(&lock))
+#define ASSERT_LOCKED(lock) LTTNG_ASSERT(pthread_mutex_trylock(&lock))
 
 /*
  * Get an aligned pointer to a value. This is meant
@@ -133,4 +122,15 @@ int lttng_strncpy(char *dst, const char *src, size_t dst_len)
 	return 0;
 }
 
+#ifdef NDEBUG
+/*
+* Force usage of the assertion condition to prevent unused variable warnings
+* when `assert()` are disabled by the `NDEBUG` definition.
+*/
+# define LTTNG_ASSERT(_cond) ((void) sizeof((void) (_cond), 0))
+#else
+# include <assert.h>
+# define LTTNG_ASSERT(_cond) assert(_cond)
+#endif
+
 #endif /* _MACROS_H */