From e5936552e1f3b3e2c10edbe9250e888bc6687584 Mon Sep 17 00:00:00 2001 From: erikjanss Date: Wed, 25 Jul 2018 01:44:29 +0200 Subject: [PATCH 1/3] bpo-34217: use lowercase header for windows includes --- Modules/socketmodule.h | 2 +- PC/getpathp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Modules/socketmodule.h b/Modules/socketmodule.h index fdb4e871cef81e..bce74c3da8fd90 100644 --- a/Modules/socketmodule.h +++ b/Modules/socketmodule.h @@ -28,7 +28,7 @@ * I use SIO_GET_MULTICAST_FILTER to detect a decent SDK. */ # ifdef SIO_GET_MULTICAST_FILTER -# include /* for SIO_RCVALL */ +# include /* for SIO_RCVALL */ # define HAVE_ADDRINFO # define HAVE_SOCKADDR_STORAGE # define HAVE_GETADDRINFO diff --git a/PC/getpathp.c b/PC/getpathp.c index df4cb0a20e3577..deda8c9ce9dc0d 100644 --- a/PC/getpathp.c +++ b/PC/getpathp.c @@ -89,7 +89,7 @@ #endif #include -#include +#include #ifdef HAVE_SYS_TYPES_H #include From c0bfe3a543165e04e0a4f847b52f51bd32cbd253 Mon Sep 17 00:00:00 2001 From: erikjanss Date: Wed, 25 Jul 2018 23:01:17 +0200 Subject: [PATCH 2/3] bpo-34217: convert Windows.h include to windows.h in _iomodule.c --- Modules/_io/_iomodule.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/_io/_iomodule.c b/Modules/_io/_iomodule.c index 667446526a0bb4..0d8a638f40cfa4 100644 --- a/Modules/_io/_iomodule.c +++ b/Modules/_io/_iomodule.c @@ -21,7 +21,7 @@ #endif /* HAVE_SYS_STAT_H */ #ifdef MS_WINDOWS -#include +#include #endif /* Various interned strings */ From 77a33231c7bc17a3ef82304b09302a87438dcac9 Mon Sep 17 00:00:00 2001 From: erikjanss Date: Wed, 15 Aug 2018 21:29:17 +0200 Subject: [PATCH 3/3] bpo-34217: replace camelcase windows headers with lowercase in socketmodule.c and pch.h --- Modules/socketmodule.c | 2 +- Tools/msi/bundle/bootstrap/pch.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c index 30001754fe576b..3a439c4bfadc30 100644 --- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c @@ -303,7 +303,7 @@ if_indextoname(index) -- return the corresponding interface name\n\ # endif /* Provides the IsWindows7SP1OrGreater() function */ -#include +#include /* remove some flags on older version Windows during run-time. https://msdn.microsoft.com/en-us/library/windows/desktop/ms738596.aspx */ diff --git a/Tools/msi/bundle/bootstrap/pch.h b/Tools/msi/bundle/bootstrap/pch.h index 6a66fa5a51ebf7..b0aa5111dabd0d 100644 --- a/Tools/msi/bundle/bootstrap/pch.h +++ b/Tools/msi/bundle/bootstrap/pch.h @@ -15,7 +15,7 @@ #include #include -#include +#include #include #include #include