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

diff --git a/src/common/macros.h b/src/common/macros.h
index 874501ef1..99d4fb31f 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,12 +75,23 @@ void *zmalloc(size_t len)
 
 #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 }))
+/* 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)))
+
+/* 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
+#else
+  /* GCC */
+# define DIAGNOSTIC_IGNORE_SUGGEST_ATTRIBUTE_FORMAT \
+	_Pragma("GCC diagnostic ignored \"-Wsuggest-attribute=format\"")
+#endif
 
 /*
  * lttng_strncpy returns 0 on success, or nonzero on failure.