diff --git a/Sources/Plasma/CoreLibExe/Pch.h b/Sources/Plasma/CoreLibExe/Pch.h index ed60a32d..5253bb15 100644 --- a/Sources/Plasma/CoreLibExe/Pch.h +++ b/Sources/Plasma/CoreLibExe/Pch.h @@ -51,6 +51,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include -#ifdef HS_BUILD_FOR_WIN32 +#if _MSC_VER #include #endif diff --git a/Sources/Plasma/CoreLibExe/hsExeError.cpp b/Sources/Plasma/CoreLibExe/hsExeError.cpp index 0707ecad..2f6d8a7a 100644 --- a/Sources/Plasma/CoreLibExe/hsExeError.cpp +++ b/Sources/Plasma/CoreLibExe/hsExeError.cpp @@ -56,7 +56,7 @@ static bool s_options[kNumErrorOptions]; AUTO_INIT_FUNC(hsExeErrorInit) { // The critical section has to be initialized // before program startup and never freed - static byte rawMemory[sizeof CCritSect]; + static byte rawMemory[sizeof(CCritSect)]; s_critsect = new(rawMemory) CCritSect; } diff --git a/Sources/Plasma/CoreLibExe/hsExeMalloc.cpp b/Sources/Plasma/CoreLibExe/hsExeMalloc.cpp index 7704a721..b0d57023 100644 --- a/Sources/Plasma/CoreLibExe/hsExeMalloc.cpp +++ b/Sources/Plasma/CoreLibExe/hsExeMalloc.cpp @@ -329,6 +329,7 @@ static void __cdecl CheckLeaksOnExit () { #endif // MEM_DEBUG //============================================================================ +#ifdef MEM_DEBUG static int __cdecl CrtAllocHook ( int method, void * pUserData, @@ -344,6 +345,7 @@ static int __cdecl CrtAllocHook ( return 1; } +#endif // MEM_DEBUG //=========================================================================== #ifdef MEM_DEBUG