Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
af11a15c
Commit
af11a15c
authored
Jan 06, 2018
by
Max Bélanger
Committed by
Steve Dower
Jan 07, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bpo-32282: Remove unnecessary check for `VersionHelpers.h` in `socketmodule.c` on Windows
parent
d80b443f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
10 deletions
+2
-10
Misc/NEWS.d/next/Core and Builtins/2017-12-12-14-02-28.bpo-32282.xFVMTn.rst
...ore and Builtins/2017-12-12-14-02-28.bpo-32282.xFVMTn.rst
+2
-0
Modules/socketmodule.c
Modules/socketmodule.c
+0
-10
No files found.
Misc/NEWS.d/next/Core and Builtins/2017-12-12-14-02-28.bpo-32282.xFVMTn.rst
0 → 100644
View file @
af11a15c
Fix an unnecessary ifdef in the include of VersionHelpers.h in socketmodule
on Windows.
Modules/socketmodule.c
View file @
af11a15c
...
@@ -297,10 +297,8 @@ http://cvsweb.netbsd.org/bsdweb.cgi/src/lib/libc/net/getaddrinfo.c.diff?r1=1.82&
...
@@ -297,10 +297,8 @@ http://cvsweb.netbsd.org/bsdweb.cgi/src/lib/libc/net/getaddrinfo.c.diff?r1=1.82&
# include <fcntl.h>
# include <fcntl.h>
# endif
# endif
#if defined(_MSC_VER) && _MSC_VER >= 1800
/* Provides the IsWindows7SP1OrGreater() function */
/* Provides the IsWindows7SP1OrGreater() function */
#include <VersionHelpers.h>
#include <VersionHelpers.h>
#endif
#endif
#endif
...
@@ -6552,15 +6550,7 @@ PyInit__socket(void)
...
@@ -6552,15 +6550,7 @@ PyInit__socket(void)
#ifdef MS_WINDOWS
#ifdef MS_WINDOWS
if
(
support_wsa_no_inherit
==
-
1
)
{
if
(
support_wsa_no_inherit
==
-
1
)
{
#if defined(_MSC_VER) && _MSC_VER >= 1800
support_wsa_no_inherit
=
IsWindows7SP1OrGreater
();
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
#endif
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment