[Python-checkins] cpython: Fix "GCC diagnostic" in socketmodule.c

victor.stinner python-checkins at python.org
Thu Mar 5 14:04:47 CET 2015


https://hg.python.org/cpython/rev/cabd257b1070
changeset:   94868:cabd257b1070
user:        Victor Stinner <victor.stinner at gmail.com>
date:        Thu Mar 05 14:04:03 2015 +0100
summary:
  Fix "GCC diagnostic" in socketmodule.c

Fix regression of changeset 7c6e3358221a on GCC < 4.4. The _socket module
cannot be compiled on "x86 FreeBSD 7.2 3.x" buildbot anymore.

files:
  Modules/socketmodule.c |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -1966,13 +1966,13 @@
     #pragma clang diagnostic push
     #pragma clang diagnostic ignored "-Wtautological-compare"
     #endif
-    #ifdef __GNUC__
+    #if defined(__GNUC__) && ((__GNUC__ == 4) || ((__GNUC__ > 4) && (__GNUC_MINOR__ > 5)))
     #pragma GCC diagnostic push
     #pragma GCC diagnostic ignored "-Wtype-limits"
     #endif
     if (msg->msg_controllen < 0)
         return 0;
-    #ifdef __GNUC__
+    #if defined(__GNUC__) && ((__GNUC__ == 4) || ((__GNUC__ > 4) && (__GNUC_MINOR__ > 5)))
     #pragma GCC diagnostic pop
     #endif
     #ifdef __clang__

-- 
Repository URL: https://hg.python.org/cpython


More information about the Python-checkins mailing list