Browse Source

Mac puts malloc.h in its own subdirectory

Michael Hansen 10 years ago
parent
commit
5bd0e8d451
  1. 4
      Sources/Plasma/FeatureLib/pfGameMgr/Pch.h
  2. 5
      Sources/Plasma/NucleusLib/pnAsyncCoreExe/Pch.h
  3. 4
      Sources/Plasma/NucleusLib/pnNetCli/Pch.h
  4. 5
      Sources/Plasma/NucleusLib/pnNetProtocol/Pch.h
  5. 4
      Sources/Plasma/NucleusLib/pnUtils/Pch.h
  6. 4
      Sources/Plasma/PubUtilLib/plNetClientComm/plNetClientComm.cpp
  7. 4
      Sources/Plasma/PubUtilLib/plNetGameLib/Pch.h
  8. 4
      Sources/Plasma/PubUtilLib/plVault/Pch.h

4
Sources/Plasma/FeatureLib/pfGameMgr/Pch.h

@ -70,4 +70,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "pfGameMgr.h" #include "pfGameMgr.h"
#include "Intern.h" #include "Intern.h"
#ifdef HS_BUILD_FOR_OSX
#include <malloc/malloc.h>
#else
#include <malloc.h> #include <malloc.h>
#endif

5
Sources/Plasma/NucleusLib/pnAsyncCoreExe/Pch.h

@ -61,4 +61,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "Private/Unix/pnAceUx.h" #include "Private/Unix/pnAceUx.h"
#include <process.h> #include <process.h>
#ifdef HS_BUILD_FOR_OSX
#include <malloc/malloc.h>
#else
#include <malloc.h> #include <malloc.h>
#endif

4
Sources/Plasma/NucleusLib/pnNetCli/Pch.h

@ -59,4 +59,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "pnNetCli.h" #include "pnNetCli.h"
#include "Intern.h" #include "Intern.h"
#ifdef HS_BUILD_FOR_OSX
#include <malloc/malloc.h>
#else
#include <malloc.h> #include <malloc.h>
#endif

5
Sources/Plasma/NucleusLib/pnNetProtocol/Pch.h

@ -64,5 +64,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "Private/pnNpAllIncludes.h" #include "Private/pnNpAllIncludes.h"
#include "Intern.h" #include "Intern.h"
#ifdef HS_BUILD_FOR_OSX
#include <malloc/malloc.h>
#else
#include <malloc.h> #include <malloc.h>
#endif

4
Sources/Plasma/NucleusLib/pnUtils/Pch.h

@ -51,7 +51,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "pnUtCoreLib.h" // must be first in list #include "pnUtCoreLib.h" // must be first in list
#include "pnUtPragma.h" #include "pnUtPragma.h"
#ifdef HS_BUILD_FOR_OSX
#include <malloc/malloc.h>
#else
#include <malloc.h> #include <malloc.h>
#endif
#ifdef HS_BUILD_FOR_WIN32 #ifdef HS_BUILD_FOR_WIN32
#pragma warning(push, 3) #pragma warning(push, 3)

4
Sources/Plasma/PubUtilLib/plNetClientComm/plNetClientComm.cpp

@ -66,7 +66,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsResMgr.h" #include "hsResMgr.h"
#ifdef HS_BUILD_FOR_OSX
#include <malloc/malloc.h>
#else
#include <malloc.h> #include <malloc.h>
#endif
extern bool gDataServerLocal; extern bool gDataServerLocal;

4
Sources/Plasma/PubUtilLib/plNetGameLib/Pch.h

@ -69,4 +69,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "Private/plNglAllIncludes.h" #include "Private/plNglAllIncludes.h"
#include "Intern.h" #include "Intern.h"
#ifdef HS_BUILD_FOR_OSX
#include <malloc/malloc.h>
#else
#include <malloc.h> #include <malloc.h>
#endif

4
Sources/Plasma/PubUtilLib/plVault/Pch.h

@ -93,4 +93,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "Intern.h" #include "Intern.h"
#ifdef HS_BUILD_FOR_OSX
#include <malloc/malloc.h>
#else
#include <malloc.h> #include <malloc.h>
#endif

Loading…
Cancel
Save