Fix UUID and issue on older Debian systems.

[m6w6/libmemcached] / libmemcached / csl / scanner.l

diff --git a/libmemcached/csl/scanner.l b/libmemcached/csl/scanner.l
index e9957408fa27d9f1ac4e0cedf8c8de98356b23c5..5a3419069faf4aa04e663ae64a808b07e821c00f 100644 (file)
--- a/libmemcached/csl/scanner.l
+++ b/libmemcached/csl/scanner.l
@@ -48,10 +48,19 @@
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #pragma GCC diagnostic ignored "-Wmissing-declarations"
 #pragma GCC diagnostic ignored "-Wunused-result"
-#pragma GCC diagnostic ignored "-Wshorten-64-to-32"
 #pragma GCC diagnostic ignored "-Wmissing-noreturn"
 #endif
 
+#ifdef __clang__
+#pragma GCC diagnostic ignored "-Wshorten-64-to-32"
+#endif
+
+#ifndef __INTEL_COMPILER
+#ifndef __clang__
+#pragma GCC diagnostic ignored "-Wlogical-op"
+#endif
+#endif
+
 #define YY_EXTRA_TYPE Context*
 
 }