From c2866ea4edae129edebc5b8438f81fe2688651a1 Mon Sep 17 00:00:00 2001 From: kamgha Date: Sat, 22 Feb 2020 12:55:45 +0100 Subject: [PATCH] Fix includes for Windows on case-sensitive filesystems Closes #866 --- dtool/src/dtoolutil/win32ArgParser.cxx | 2 +- panda/src/device/winInputDeviceManager.h | 2 +- panda/src/device/winRawInputDevice.cxx | 2 +- panda/src/device/xInputDevice.cxx | 4 ++-- panda/src/device/xInputDevice.h | 2 +- panda/src/display/graphicsEngine.cxx | 2 +- panda/src/downloader/bioStreamBuf.cxx | 2 +- panda/src/downloader/httpChannel.cxx | 2 +- panda/src/nativenet/socket_portable.h | 2 +- panda/src/net/connectionManager.cxx | 2 +- panda/src/pstatclient/pStatClientImpl.cxx | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dtool/src/dtoolutil/win32ArgParser.cxx b/dtool/src/dtoolutil/win32ArgParser.cxx index 4faf6bff95..81fb6ba7e9 100644 --- a/dtool/src/dtoolutil/win32ArgParser.cxx +++ b/dtool/src/dtoolutil/win32ArgParser.cxx @@ -22,7 +22,7 @@ #include "executionEnvironment.h" #include -#include +#include using std::string; diff --git a/panda/src/device/winInputDeviceManager.h b/panda/src/device/winInputDeviceManager.h index 13cab3d7c0..e98a42a0bb 100644 --- a/panda/src/device/winInputDeviceManager.h +++ b/panda/src/device/winInputDeviceManager.h @@ -20,7 +20,7 @@ #include "xInputDevice.h" -#include +#include #include class WinRawInputDevice; diff --git a/panda/src/device/winRawInputDevice.cxx b/panda/src/device/winRawInputDevice.cxx index 9411ad508b..010766edf0 100644 --- a/panda/src/device/winRawInputDevice.cxx +++ b/panda/src/device/winRawInputDevice.cxx @@ -19,7 +19,7 @@ #if defined(_WIN32) && !defined(CPPPARSER) -#include +#include #include #include "phidsdi.h" diff --git a/panda/src/device/xInputDevice.cxx b/panda/src/device/xInputDevice.cxx index b86a5cd90b..e59a937f20 100644 --- a/panda/src/device/xInputDevice.cxx +++ b/panda/src/device/xInputDevice.cxx @@ -19,8 +19,8 @@ #include "inputDeviceManager.h" #include "string_utils.h" -#include -#include +#include +#include #ifndef XUSER_MAX_COUNT #define XUSER_MAX_COUNT 4 diff --git a/panda/src/device/xInputDevice.h b/panda/src/device/xInputDevice.h index 2088c19182..c4a1f58d27 100644 --- a/panda/src/device/xInputDevice.h +++ b/panda/src/device/xInputDevice.h @@ -19,7 +19,7 @@ #if defined(_WIN32) && !defined(CPPPARSER) -#include +#include class InputDeviceManager; diff --git a/panda/src/display/graphicsEngine.cxx b/panda/src/display/graphicsEngine.cxx index c7951ee95a..b900dc26e6 100644 --- a/panda/src/display/graphicsEngine.cxx +++ b/panda/src/display/graphicsEngine.cxx @@ -55,7 +55,7 @@ #if defined(WIN32) #define WINDOWS_LEAN_AND_MEAN - #include + #include #include #undef WINDOWS_LEAN_AND_MEAN #else diff --git a/panda/src/downloader/bioStreamBuf.cxx b/panda/src/downloader/bioStreamBuf.cxx index 1598b15259..33782df154 100644 --- a/panda/src/downloader/bioStreamBuf.cxx +++ b/panda/src/downloader/bioStreamBuf.cxx @@ -19,7 +19,7 @@ #ifdef HAVE_OPENSSL #if defined(WIN32_VC) || defined(WIN64_VC) - #include + #include #include // for WSAGetLastError() #undef X509_NAME #endif // WIN32_VC diff --git a/panda/src/downloader/httpChannel.cxx b/panda/src/downloader/httpChannel.cxx index 365c819b0f..679cb6f6de 100644 --- a/panda/src/downloader/httpChannel.cxx +++ b/panda/src/downloader/httpChannel.cxx @@ -30,7 +30,7 @@ #include "openSSLWrapper.h" #if defined(WIN32_VC) || defined(WIN64_VC) - #include + #include #include // for select() #undef X509_NAME #endif // WIN32_VC diff --git a/panda/src/nativenet/socket_portable.h b/panda/src/nativenet/socket_portable.h index a4a249f92e..2ac1c89248 100644 --- a/panda/src/nativenet/socket_portable.h +++ b/panda/src/nativenet/socket_portable.h @@ -53,7 +53,7 @@ typedef unsigned long SOCKET; ************************************************************************/ #elif defined(_WIN32) #include -#include +#include typedef u_short sa_family_t; diff --git a/panda/src/net/connectionManager.cxx b/panda/src/net/connectionManager.cxx index f125356f50..0a92cb1222 100644 --- a/panda/src/net/connectionManager.cxx +++ b/panda/src/net/connectionManager.cxx @@ -25,7 +25,7 @@ #if defined(CPPPARSER) #elif defined(WIN32_VC) || defined(WIN64_VC) #include // For gethostname() -#include // For GetAdaptersAddresses() +#include // For GetAdaptersAddresses() #elif defined(__ANDROID__) #include #else diff --git a/panda/src/pstatclient/pStatClientImpl.cxx b/panda/src/pstatclient/pStatClientImpl.cxx index d607a53bd9..ffdd5e2362 100644 --- a/panda/src/pstatclient/pStatClientImpl.cxx +++ b/panda/src/pstatclient/pStatClientImpl.cxx @@ -28,7 +28,7 @@ #include #if defined(WIN32_VC) || defined(WIN64_VC) -#include +#include #include #endif