diff options
Diffstat (limited to 'src/server')
| -rw-r--r-- | src/server/game/World/World.cpp | 2 | ||||
| -rw-r--r-- | src/server/shared/DetourMemoryFunctions.h (renamed from src/server/shared/Memory.h) | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index e58ce88ef86..5a3ef8104f3 100644 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -47,6 +47,7 @@ #include "CreatureTextMgr.h" #include "DatabaseEnv.h" #include "DB2Stores.h" +#include "DetourMemoryFunctions.h" #include "DisableMgr.h" #include "GameEventMgr.h" #include "GameObjectModel.h" @@ -67,7 +68,6 @@ #include "LootMgr.h" #include "M2Stores.h" #include "MapManager.h" -#include "Memory.h" #include "Metric.h" #include "MiscPackets.h" #include "MMapFactory.h" diff --git a/src/server/shared/Memory.h b/src/server/shared/DetourMemoryFunctions.h index c28aec52081..972e5eda4b1 100644 --- a/src/server/shared/Memory.h +++ b/src/server/shared/DetourMemoryFunctions.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef _MEMORY_H -#define _MEMORY_H +#ifndef TRINITY_DETOUR_MEMORY_FUNCTIONS_H +#define TRINITY_DETOUR_MEMORY_FUNCTIONS_H #include "DetourAlloc.h" @@ -31,4 +31,4 @@ inline void dtCustomFree(void* ptr) delete [] (unsigned char*)ptr; } -#endif +#endif // TRINITY_DETOUR_MEMORY_FUNCTIONS_H |