X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fmacros.h;h=874501ef1749325b38ba6d4214990da1396cd74a;hp=e28250f7ed20a7892600c161f6b0921ff10424d3;hb=1cbd136b2479ef142bfb339b13d3d25aa772dda5;hpb=1405051ad116a8bd42b68822be6d2f9b3def6c65

diff --git a/src/common/macros.h b/src/common/macros.h
index e28250f7e..874501ef1 100644
--- a/src/common/macros.h
+++ b/src/common/macros.h
@@ -57,20 +57,30 @@ void *zmalloc(size_t len)
 	})
 #endif
 
-#ifndef max
-#define max(a, b) ((a) > (b) ? (a) : (b))
-#endif
 
-#ifndef max_t
-#define max_t(type, a, b)	max((type) a, (type) b)
-#endif
+/*
+ * The min and max macros are not needed in C++ (std::min and std::max are
+ * preferred) and they conflict with some C++ header file. Don't define them
+ * when compiling C++ source.
+ */
+#ifndef __cplusplus
 
-#ifndef min
-#define min(a, b) ((a) < (b) ? (a) : (b))
-#endif
+# ifndef max
+#  define max(a, b) ((a) > (b) ? (a) : (b))
+# endif
+
+# ifndef min
+#  define min(a, b) ((a) < (b) ? (a) : (b))
+# endif
+
+# ifndef max_t
+#  define max_t(type, a, b)	max((type) a, (type) b)
+# endif
+
+# ifndef min_t
+#  define min_t(type, a, b)	min((type) a, (type) b)
+# endif
 
-#ifndef min_t
-#define min_t(type, a, b)	min((type) a, (type) b)
 #endif
 
 #ifndef LTTNG_PACKED
@@ -85,28 +95,11 @@ void *zmalloc(size_t len)
 #endif
 #endif
 
-#define is_signed(type) (((type) (-1)) < 0)
-
-/*
- * Align value to the next multiple of align. Returns val if it already is a
- * multiple of align. Align must be a power of two.
- */
-#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 is_signed(type) (((type) -1) < (type) 1)
 
 #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 +126,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 */