From: Victor Stinner <victor.stinner@gmail.com>
Date: Thu, 5 Mar 2015 13:04:03 +0000 (+0100)
Subject: Fix "GCC diagnostic" in socketmodule.c
X-Git-Tag: v3.5.0a2~23
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a4c727131efc4b1a7f08d837d20bd9f592197e52;p=thirdparty%2FPython%2Fcpython.git

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.
---

diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index 4eb3978bec80..483dae546add 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -1966,13 +1966,13 @@ cmsg_min_space(struct msghdr *msg, struct cmsghdr *cmsgh, size_t space)
     #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__