X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fmacros.hpp;fp=src%2Fcommon%2Fmacros.hpp;h=cfe6eb5289d637ef1f1d1ddafe1b2f808a78535a;hb=efc2642c22639e9af4bd01953bfd4453f6218f61;hp=37e6cabcf32e8701b369dab4ce96d3a17dc75724;hpb=460bede77c5a79691a3e1fca03c2d64209038f31;p=lttng-tools.git

diff --git a/src/common/macros.hpp b/src/common/macros.hpp
index 37e6cabcf..cfe6eb528 100644
--- a/src/common/macros.hpp
+++ b/src/common/macros.hpp
@@ -276,9 +276,13 @@ void *memmove(T *d, const U *s, size_t n) = delete;
 	_Pragma("GCC diagnostic ignored \"-Wformat-nonliteral\"")
 # define DIAGNOSTIC_IGNORE_LOGICAL_OP \
 	_Pragma("GCC diagnostic ignored \"-Wlogical-op\"")
-# define DIAGNOSTIC_IGNORE_DUPLICATED_BRANCHES \
+#if __GNUG__ && __GNUC__ >= 7
+# define DIAGNOSTIC_IGNORE_DUPLICATED_BRANCHES				\
 	_Pragma("GCC diagnostic ignored \"-Wduplicated-branches\"")
-# define DIAGNOSTIC_IGNORE_INVALID_OFFSETOF \
+#else
+# define DIAGNOSTIC_IGNORE_DUPLICATED_BRANCHES
+#endif /* __GNUG__ && __GNUC__ >= 7 */
+# define DIAGNOSTIC_IGNORE_INVALID_OFFSETOF				\
 	_Pragma("GCC diagnostic ignored \"-Winvalid-offsetof\"")
 #endif