})
#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
#define is_signed(type) (((type) -1) < (type) 1)
-/*
- * 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 member_sizeof(type, field) sizeof(((type *) 0)->field)
#define ASSERT_LOCKED(lock) LTTNG_ASSERT(pthread_mutex_trylock(&lock))
-/*
- * Get an aligned pointer to a value. This is meant
- * as a helper to pass an aligned pointer to a member in a packed structure
- * to a function.
- */
-#define ALIGNED_CONST_PTR(value) (((const typeof(value) []) { value }))
-
/*
* lttng_strncpy returns 0 on success, or nonzero on failure.
* It checks that the @src string fits into @dst_len before performing