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

874809ea · Erik Janssens · Benjamin Peterson · 3876af4f · 874809ea · 874809ea
Commit 874809ea authored Sep 05, 2018 by Erik Janssens Committed by Benjamin Peterson Sep 04, 2018
Showing with 6 additions and 2 deletions

Misc/NEWS.d/next/Windows/2018-09-04-23-13-19.bpo-34581.lnbC0k.rst ...S.d/next/Windows/2018-09-04-23-13-19.bpo-34581.lnbC0k.rst +1 -0

Modules/socketmodule.c Modules/socketmodule.c +5 -2

No files found.
--- 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
+Guard MSVC-specific code in socketmodule.c with ``#ifdef _MSC_VER``.
--- 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? */