src: fix warnings about redefined BSWAP macros

sam-github · targos · commit d2e1efe8a38b · 2019-05-14T17:33:06.000+02:00
PR-URL: #27631 Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
diff --git a/src/util-inl.h b/src/util-inl.h
@@ -27,6 +27,18 @@
 #include <cstring>
 #include "util.h"
 
+// These are defined by <sys/byteorder.h> or <netinet/in.h> on some systems.
+// To avoid warnings, undefine them before redefining them.
+#ifdef BSWAP_2
+# undef BSWAP_2
+#endif
+#ifdef BSWAP_4
+# undef BSWAP_4
+#endif
+#ifdef BSWAP_8
+# undef BSWAP_8
+#endif
+
 #if defined(_MSC_VER)
 #include <intrin.h>
 #define BSWAP_2(x) _byteswap_ushort(x)
