Browse Source

CoreLibExe fixes for mingw support.

Darryl Pogue 14 years ago
parent
commit
42c9df919b
  1. 2
      Sources/Plasma/CoreLibExe/Pch.h
  2. 2
      Sources/Plasma/CoreLibExe/hsExeError.cpp
  3. 2
      Sources/Plasma/CoreLibExe/hsExeMalloc.cpp

2
Sources/Plasma/CoreLibExe/Pch.h

@ -51,6 +51,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include <malloc.h>
#ifdef HS_BUILD_FOR_WIN32
#if _MSC_VER
#include <crtdbg.h>
#endif

2
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;
}

2
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

Loading…
Cancel
Save