src: fix ignore GCC -Wcast-function-type for older compilers

Fixes: #31517 PR-URL: #31524 Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com> Reviewed-By: Rich Trott <rtrott@gmail.com>
nodejs · Feb 17, 2020 · 83dd65a · 83dd65a
1 parent 13c6965
commit 83dd65a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/src/base_object-inl.h b/src/base_object-inl.h
@@ -28,12 +28,12 @@
 #include "env-inl.h"
 #include "util.h"
 
-#if defined(__GNUC__) && !defined(__clang__)
+#if (__GNUC__ >= 8) && !defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wcast-function-type"
 #endif
 #include "v8.h"
-#if defined(__GNUC__) && !defined(__clang__)
+#if (__GNUC__ >= 8) && !defined(__clang__)
 #pragma GCC diagnostic pop
 #endif
 

diff --git a/src/node.h b/src/node.h
@@ -60,14 +60,15 @@
 # define SIGKILL 9
 #endif
 
-#if defined(__GNUC__) && !defined(__clang__)
+#if (__GNUC__ >= 8) && !defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wcast-function-type"
 #endif
 #include "v8.h"  // NOLINT(build/include_order)
-#if defined(__GNUC__) && !defined(__clang__)
+#if (__GNUC__ >= 8) && !defined(__clang__)
 #pragma GCC diagnostic pop
 #endif
+
 #include "v8-platform.h"  // NOLINT(build/include_order)
 #include "node_version.h"  // NODE_MODULE_VERSION
 

diff --git a/src/util.h b/src/util.h
@@ -24,12 +24,12 @@
 
 #if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
 
-#if defined(__GNUC__) && !defined(__clang__)
+#if (__GNUC__ >= 8) && !defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wcast-function-type"
 #endif
 #include "v8.h"
-#if defined(__GNUC__) && !defined(__clang__)
+#if (__GNUC__ >= 8) && !defined(__clang__)
 #pragma GCC diagnostic pop
 #endif