Skip to content

[3.6] bpo-32282: Remove unnecessary check for VersionHelpers.h in socketmodule.c on Windows #5120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
berkerpeksag merged 1 commit into from
May 18, 2018
Merged

[3.6] bpo-32282: Remove unnecessary check for VersionHelpers.h in socketmodule.c on Windows #5120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Core and Builtins/2017-12-12-14-02-28.bpo-32282.xFVMTn.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix an unnecessary ifdef in the include of VersionHelpers.h in socketmodule
on Windows.
10 changes: 0 additions & 10 deletions Modules/socketmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,10 +312,8 @@ if_indextoname(index) -- return the corresponding interface name\n\
# include <fcntl.h>
# endif

#if defined(_MSC_VER) && _MSC_VER >= 1800
/* Provides the IsWindows7SP1OrGreater() function */
#include <VersionHelpers.h>
#endif

#endif

Expand Down Expand Up @@ -6510,15 +6508,7 @@ PyInit__socket(void)

#ifdef MS_WINDOWS
if (support_wsa_no_inherit == -1) {
#if defined(_MSC_VER) && _MSC_VER >= 1800
support_wsa_no_inherit = IsWindows7SP1OrGreater();
#else
DWORD version = GetVersion();
DWORD major = (DWORD)LOBYTE(LOWORD(version));
DWORD minor = (DWORD)HIBYTE(LOWORD(version));
/* need Windows 7 SP1, 2008 R2 SP1 or later */
support_wsa_no_inherit = major > 6 || (major == 6 && minor >= 1);
#endif
}
#endif

Expand Down