X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Fcommon%2Fmacros.h;h=6ac24fa01157b79cbf1debc58fbcb49438288af2;hb=d50d200af8d01f4b58a14e384cabd46b1afb4817;hp=7530c912a98251160b608e0bc0b4bf4daefff42e;hpb=7966af5763c4aaca39df9bbfa9277ff15715c720;p=lttng-tools.git

diff --git a/src/common/macros.h b/src/common/macros.h
index 7530c912a..6ac24fa01 100644
--- a/src/common/macros.h
+++ b/src/common/macros.h
@@ -57,32 +57,6 @@ void *zmalloc(size_t len)
 	})
 #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 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
-
-#endif
-
 #ifndef LTTNG_PACKED
 #define LTTNG_PACKED __attribute__((__packed__))
 #endif
@@ -101,6 +75,39 @@ void *zmalloc(size_t len)
 
 #define ASSERT_LOCKED(lock) LTTNG_ASSERT(pthread_mutex_trylock(&lock))
 
+/* Attribute suitable to tag functions as having printf()-like arguments. */
+#define ATTR_FORMAT_PRINTF(_string_index, _first_to_check) \
+	__attribute__((format(printf, _string_index, _first_to_check)))
+
+/* Attribute suitable to tag functions as having strftime()-like arguments. */
+#define ATTR_FORMAT_STRFTIME(_string_index) \
+	__attribute__((format(strftime, _string_index, 0)))
+
+/* Macros used to ignore specific compiler diagnostics. */
+
+#define DIAGNOSTIC_PUSH _Pragma("GCC diagnostic push")
+#define DIAGNOSTIC_POP _Pragma("GCC diagnostic pop")
+
+#if defined(__clang__)
+  /* Clang */
+# define DIAGNOSTIC_IGNORE_SUGGEST_ATTRIBUTE_FORMAT
+# define DIAGNOSTIC_IGNORE_FORMAT_NONLITERAL \
+	_Pragma("GCC diagnostic ignored \"-Wformat-nonliteral\"")
+#else
+  /* GCC */
+# define DIAGNOSTIC_IGNORE_SUGGEST_ATTRIBUTE_FORMAT \
+	_Pragma("GCC diagnostic ignored \"-Wsuggest-attribute=format\"")
+# define DIAGNOSTIC_IGNORE_FORMAT_NONLITERAL \
+	_Pragma("GCC diagnostic ignored \"-Wformat-nonliteral\"")
+#endif
+
+/* Used to make specific C++ functions to C code. */
+#ifdef __cplusplus
+#define C_LINKAGE extern "C"
+#else
+#define C_LINKAGE
+#endif
+
 /*
  * lttng_strncpy returns 0 on success, or nonzero on failure.
  * It checks that the @src string fits into @dst_len before performing