closes bpo-34581 : Conditionalize use of __pragma in Modules/socketmodule.c. (GH...

(cherry picked from commit 874809ea389e6434787e773a6054a08e0b81f734)

Co-authored-by: Erik Janssens <erik.janssens@conceptive.be>

diff --git a/Misc/NEWS.d/next/Windows/2018-09-04-23-13-19.bpo-34581.lnbC0k.rst b/Misc/NEWS.d/next/Windows/2018-09-04-23-13-19.bpo-34581.lnbC0k.rst
new file mode 100644 (file)
index 0000000..2dfa1ae
--- /dev/null
+++ b/Misc/NEWS.d/next/Windows/2018-09-04-23-13-19.bpo-34581.lnbC0k.rst
@@ -0,0 +1 @@
+Guard MSVC-specific code in socketmodule.c with ``#ifdef _MSC_VER``.

diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index ea01a286874baaf916e2c26e3ec9e96d9affc5b5..f40bd89e577f1e737b588d4f3e2f3c9b30069c1c 100644 (file)
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -559,15 +559,18 @@ select_error(void)
 #  define SET_SOCK_ERROR(err) WSASetLastError(err)
 #  define SOCK_TIMEOUT_ERR WSAEWOULDBLOCK
 #  define SOCK_INPROGRESS_ERR WSAEWOULDBLOCK
-#  define SUPPRESS_DEPRECATED_CALL __pragma(warning(suppress: 4996))
 #else
 #  define GET_SOCK_ERROR errno
 #  define SET_SOCK_ERROR(err) do { errno = err; } while (0)
 #  define SOCK_TIMEOUT_ERR EWOULDBLOCK
 #  define SOCK_INPROGRESS_ERR EINPROGRESS
-#  define SUPPRESS_DEPRECATED_CALL
 #endif
 
+#ifdef _MSC_VER
+#  define SUPPRESS_DEPRECATED_CALL __pragma(warning(suppress: 4996))
+#else
+#  define SUPPRESS_DEPRECATED_CALL
+#endif
 
 #ifdef MS_WINDOWS
 /* Does WSASocket() support the WSA_FLAG_NO_HANDLE_INHERIT flag? */