Skip to content

bpo-34217: Fix include "Windows.h" case for cross-compiling #8472

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
merged 3 commits into from
Aug 16, 2018
Merged

bpo-34217: Fix include "Windows.h" case for cross-compiling #8472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e593655
bpo-34217: use lowercase header for windows includes
erikjanss Jul 24, 2018
c0bfe3a
bpo-34217: convert Windows.h include to windows.h in _iomodule.c
erikjanss Jul 25, 2018
77a3323
bpo-34217: replace camelcase windows headers with lowercase in socket…
erikjanss Aug 15, 2018
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: 1 addition & 1 deletion Modules/_io/_iomodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#endif /* HAVE_SYS_STAT_H */

#ifdef MS_WINDOWS
#include <Windows.h>
#include <windows.h>
#endif

/* Various interned strings */
Expand Down
2 changes: 1 addition & 1 deletion Modules/socketmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ if_indextoname(index) -- return the corresponding interface name\n\
# endif

/* Provides the IsWindows7SP1OrGreater() function */
#include <VersionHelpers.h>
#include <versionhelpers.h>

/* remove some flags on older version Windows during run-time.
https://msdn.microsoft.com/en-us/library/windows/desktop/ms738596.aspx */
Expand Down
2 changes: 1 addition & 1 deletion Modules/socketmodule.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
* I use SIO_GET_MULTICAST_FILTER to detect a decent SDK.
*/
# ifdef SIO_GET_MULTICAST_FILTER
# include <MSTcpIP.h> /* for SIO_RCVALL */
# include <mstcpip.h> /* for SIO_RCVALL */
# define HAVE_ADDRINFO
# define HAVE_SOCKADDR_STORAGE
# define HAVE_GETADDRINFO
Expand Down
2 changes: 1 addition & 1 deletion PC/getpathp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
#endif

#include <windows.h>
#include <Shlwapi.h>
#include <shlwapi.h>

#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
Expand Down
2 changes: 1 addition & 1 deletion Tools/msi/bundle/bootstrap/pch.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

#include <windows.h>
#include <gdiplus.h>
#include <Uxtheme.h>
#include <uxtheme.h>
#include <msiquery.h>
#include <objbase.h>
#include <shlobj.h>
Expand Down