X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fmacros.hpp;h=ecaaa4cda2edbb0c6fdc273bf67c858ebaa2f2f7;hb=3691d312bcf4dc2cc15f0ecb1f0e2fd2f34315b8;hp=a4ff6504d078807056330c4fd8f3e25b3a05f2ad;hpb=f12e33ba4926d519a81baa388384fc54afde3985;p=lttng-tools.git

diff --git a/src/common/macros.hpp b/src/common/macros.hpp
index a4ff6504d..ecaaa4cda 100644
--- a/src/common/macros.hpp
+++ b/src/common/macros.hpp
@@ -15,6 +15,8 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <memory>
+#include <pthread.h>
 #include <type_traits>
 
 /*
@@ -271,6 +273,9 @@ void *memmove(T *d, const U *s, size_t n) = delete;
 # define DIAGNOSTIC_IGNORE_FORMAT_NONLITERAL \
 	_Pragma("GCC diagnostic ignored \"-Wformat-nonliteral\"")
 # define DIAGNOSTIC_IGNORE_LOGICAL_OP
+# define DIAGNOSTIC_IGNORE_DUPLICATED_BRANCHES
+# define DIAGNOSTIC_IGNORE_INVALID_OFFSETOF
+	_Pragma("GCC diagnostic ignored \"-Winvalid-offsetof\"")
 #else
   /* GCC */
 # define DIAGNOSTIC_IGNORE_SUGGEST_ATTRIBUTE_FORMAT \
@@ -279,6 +284,10 @@ 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 \
+	_Pragma("GCC diagnostic ignored \"-Wduplicated-branches\"")
+# define DIAGNOSTIC_IGNORE_INVALID_OFFSETOF \
+	_Pragma("GCC diagnostic ignored \"-Winvalid-offsetof\"")
 #endif
 
 /* Used to make specific C++ functions to C code. */