From 712d59281f91ada14ede3370bac1f77a86d091fe Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Mon, 31 Dec 2012 22:52:04 -0500 Subject: [PATCH] Fix issues from review - Use lowercase win32 header names for cross-compiling with MinGW - Correct a unix GUID forward declaration --- Sources/Plasma/Apps/plClient/winmain.cpp | 2 +- Sources/Plasma/CoreLib/hsWindows.h | 2 +- Sources/Plasma/PubUtilLib/plAudio/plEAXEffects.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Sources/Plasma/Apps/plClient/winmain.cpp b/Sources/Plasma/Apps/plClient/winmain.cpp index 29e327e4..4d086bfe 100644 --- a/Sources/Plasma/Apps/plClient/winmain.cpp +++ b/Sources/Plasma/Apps/plClient/winmain.cpp @@ -46,7 +46,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include #include // windows directory handling fxns (for chdir) #include -#include // ShellExecuteA +#include // ShellExecuteA //#define DETACH_EXE // Microsoft trick to force loading of exe to memory #ifdef DETACH_EXE diff --git a/Sources/Plasma/CoreLib/hsWindows.h b/Sources/Plasma/CoreLib/hsWindows.h index e1b50c39..2bafc8f1 100644 --- a/Sources/Plasma/CoreLib/hsWindows.h +++ b/Sources/Plasma/CoreLib/hsWindows.h @@ -63,7 +63,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com # define NOMINMAX # define WIN32_LEAN_AND_MEAN -# include +# include # include // Pulls in WinSock 2 for us // This needs to be after #include , since it also includes windows.h diff --git a/Sources/Plasma/PubUtilLib/plAudio/plEAXEffects.h b/Sources/Plasma/PubUtilLib/plAudio/plEAXEffects.h index 1f465b12..d5c68c46 100644 --- a/Sources/Plasma/PubUtilLib/plAudio/plEAXEffects.h +++ b/Sources/Plasma/PubUtilLib/plAudio/plEAXEffects.h @@ -68,7 +68,7 @@ typedef struct _EAXREVERBPROPERTIES EAXREVERBPROPERTIES; #if HS_BUILD_FOR_WIN32 typedef struct _GUID GUID; #else -# define GUID char* + typedef char* GUID; #endif class plEAXListener