From 5b17d7fccd8f0b4d5030b03924eb00904585ba31 Mon Sep 17 00:00:00 2001 From: "Miss Islington (bot)" <31488909+miss-islington@users.noreply.github.com> Date: Tue, 4 Sep 2018 23:45:03 -0700 Subject: [PATCH] closes bpo-34581 : Conditionalize use of __pragma in Modules/socketmodule.c. (GH-9067) (cherry picked from commit 874809ea389e6434787e773a6054a08e0b81f734) Co-authored-by: Erik Janssens --- .../next/Windows/2018-09-04-23-13-19.bpo-34581.lnbC0k.rst | 1 + Modules/socketmodule.c | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 Misc/NEWS.d/next/Windows/2018-09-04-23-13-19.bpo-34581.lnbC0k.rst 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 index 000000000000..2dfa1aec9b86 --- /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 ea01a286874b..f40bd89e577f 100644 --- 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? */ -- 2.47.3