Later in the series, the min macro conflicted with a C++ header file.
Since the min and max macros are not useful in C++ (std::min/std::max
are preferred, don't define them when building a C++ file. Don't define
min_t and max_t either, they too can be replaced with std::min and
std::max, which are templated / type-safe.
Change-Id: I3d56d325f6508c32baba674c335c3f4ab0ecc582
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
-#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
#endif
#ifndef LTTNG_PACKED