From e518605d693399a83543da47ef034b0da8bcd305 Mon Sep 17 00:00:00 2001 From: Scott Ehlert Date: Sat, 29 May 2010 18:11:47 -0400 Subject: [PATCH] Fixed various areas where code was being compiled for Linux only, but should actually be used on OS X too (bug 4392, r=dvander). --- core/ConsoleDetours.cpp | 2 +- core/HalfLife2.cpp | 2 +- core/LibrarySys.cpp | 2 +- core/logic/GameConfigs.cpp | 6 +++--- core/smn_core.cpp | 7 ++----- core/smn_profiler.cpp | 2 +- extensions/sdktools/detours.h | 2 +- extensions/sdktools/output.cpp | 4 ++-- extensions/sdktools/vcaller.cpp | 2 +- extensions/sdktools/vglobals.cpp | 2 +- extensions/sqlite/driver/SqDriver.cpp | 2 +- extensions/tf2/CDetour/detourhelpers.h | 4 ++-- 12 files changed, 17 insertions(+), 20 deletions(-) diff --git a/core/ConsoleDetours.cpp b/core/ConsoleDetours.cpp index 49c5d8cb..a77bdca6 100644 --- a/core/ConsoleDetours.cpp +++ b/core/ConsoleDetours.cpp @@ -51,7 +51,7 @@ #include "ConCommandBaseIterator.h" #include "ShareSys.h" -#if defined PLATFORM_LINUX +#if defined PLATFORM_POSIX # include # include # include diff --git a/core/HalfLife2.cpp b/core/HalfLife2.cpp index 5badde01..55d9ef62 100644 --- a/core/HalfLife2.cpp +++ b/core/HalfLife2.cpp @@ -153,7 +153,7 @@ void CHalfLife2::OnSourceModAllInitialized_Post() return; } g_EntList = *reinterpret_cast(addr + offset); -#elif defined PLATFORM_LINUX +#elif defined PLATFORM_LINUX || defined PLATFORM_APPLE /* gEntList and/or g_pEntityList */ if (!g_pGameConf->GetMemSig("gEntList", (void **)&addr)) { diff --git a/core/LibrarySys.cpp b/core/LibrarySys.cpp index 23fefc25..3206377d 100644 --- a/core/LibrarySys.cpp +++ b/core/LibrarySys.cpp @@ -241,7 +241,7 @@ bool LibrarySystem::IsPathDirectory(const char *path) return true; } -#elif defined PLATFORM_LINUX +#elif defined PLATFORM_POSIX struct stat s; if (stat(path, &s) != 0) diff --git a/core/logic/GameConfigs.cpp b/core/logic/GameConfigs.cpp index 30d814a1..fb6421c4 100644 --- a/core/logic/GameConfigs.cpp +++ b/core/logic/GameConfigs.cpp @@ -43,7 +43,7 @@ #include "sm_crc32.h" #include "MemoryUtils.h" -#if defined PLATFORM_LINUX +#if defined PLATFORM_POSIX #include #endif @@ -523,7 +523,7 @@ SMCResult CGameConfig::ReadSMC_LeavingSection(const SMCStates *states) s_TempSig.library, m_CurFile); } else { -#if defined PLATFORM_LINUX +#if defined PLATFORM_POSIX if (s_TempSig.sig[0] == '@') { Dl_info info; @@ -570,7 +570,7 @@ SMCResult CGameConfig::ReadSMC_LeavingSection(const SMCStates *states) } } -#if defined PLATFORM_LINUX +#if defined PLATFORM_POSIX skip_find: #endif m_Sigs.replace(m_offset, final_addr); diff --git a/core/smn_core.cpp b/core/smn_core.cpp index 78eb3431..33bbc6be 100644 --- a/core/smn_core.cpp +++ b/core/smn_core.cpp @@ -46,7 +46,7 @@ #if defined PLATFORM_WINDOWS #include -#elif defined PLATFORM_LINUX +#elif defined PLATFORM_POSIX #include #include #include @@ -407,7 +407,7 @@ static cell_t GetSysTickCount(IPluginContext *pContext, const cell_t *params) { #if defined PLATFORM_WINDOWS return (cell_t)GetTickCount(); -#elif defined PLATFORM_LINUX +#elif defined PLATFORM_POSIX tms tm; clock_t ticks = times(&tm); long ticks_per_sec = sysconf(_SC_CLK_TCK); @@ -419,9 +419,6 @@ static cell_t GetSysTickCount(IPluginContext *pContext, const cell_t *params) fticks -= r; } return (cell_t)fticks; -#elif defined PLATFORM_APPLE - assert(false); - return 0; #endif } diff --git a/core/smn_profiler.cpp b/core/smn_profiler.cpp index 4fa8eca1..e3418857 100644 --- a/core/smn_profiler.cpp +++ b/core/smn_profiler.cpp @@ -34,7 +34,7 @@ //Note: Do not add this to Linux yet, i haven't done the HPET timing research (if even available) //nonetheless we need accurate counting -#if !defined PLATFORM_LINUX +#if !defined PLATFORM_LINUX && !defined PLATFORM_APPLE struct Profiler { diff --git a/extensions/sdktools/detours.h b/extensions/sdktools/detours.h index a028e3a4..938d85cd 100644 --- a/extensions/sdktools/detours.h +++ b/extensions/sdktools/detours.h @@ -52,7 +52,7 @@ struct patch_t inline void ProtectMemory(void *addr, int length, int prot) { -#if defined PLATFORM_LINUX +#if defined PLATFORM_POSIX void *addr2 = (void *)ALIGN(addr); mprotect(addr2, sysconf(_SC_PAGESIZE), prot); #elif defined PLATFORM_WINDOWS diff --git a/extensions/sdktools/output.cpp b/extensions/sdktools/output.cpp index d2de0f17..290ba750 100644 --- a/extensions/sdktools/output.cpp +++ b/extensions/sdktools/output.cpp @@ -124,7 +124,7 @@ bool EntityOutputManager::CreateFireEventDetour() IA32_Push_Reg(jit, REG_ECX); -#elif defined PLATFORM_LINUX +#elif defined PLATFORM_LINUX || defined PLATFORM_APPLE IA32_Push_Rm_Disp8_ESP(jit, 20); IA32_Push_Rm_Disp8_ESP(jit, 20); IA32_Push_Rm_Disp8_ESP(jit, 20); @@ -136,7 +136,7 @@ bool EntityOutputManager::CreateFireEventDetour() IA32_Write_Jump32_Abs(jit, call, (void *)TempDetour); -#if defined PLATFORM_LINUX +#if defined PLATFORM_LINUX || defined PLATFORM_APPLE IA32_Add_Rm_Imm8(jit, REG_ESP, 4, MOD_REG); //add esp, 4 #elif defined PLATFORM_WINDOWS IA32_Pop_Reg(jit, REG_ECX); diff --git a/extensions/sdktools/vcaller.cpp b/extensions/sdktools/vcaller.cpp index f525f30a..bc3f631a 100644 --- a/extensions/sdktools/vcaller.cpp +++ b/extensions/sdktools/vcaller.cpp @@ -116,7 +116,7 @@ static cell_t PrepSDKCall_SetSignature(IPluginContext *pContext, const cell_t *p char *sig; pContext->LocalToString(params[2], &sig); -#if defined PLATFORM_LINUX +#if defined PLATFORM_POSIX if (sig[0] == '@') { Dl_info info; diff --git a/extensions/sdktools/vglobals.cpp b/extensions/sdktools/vglobals.cpp index 46c7431e..1e45c7cd 100644 --- a/extensions/sdktools/vglobals.cpp +++ b/extensions/sdktools/vglobals.cpp @@ -54,7 +54,7 @@ void InitializeValveGlobals() return; } g_pGameRules = *reinterpret_cast(addr + offset); -#elif defined PLATFORM_LINUX +#elif defined PLATFORM_LINUX || defined PLATFORM_APPLE /* g_pGameRules */ if (!g_pGameConf->GetMemSig("g_pGameRules", (void **)&addr) || !addr) { diff --git a/extensions/sqlite/driver/SqDriver.cpp b/extensions/sqlite/driver/SqDriver.cpp index 5380394b..9bf41494 100644 --- a/extensions/sqlite/driver/SqDriver.cpp +++ b/extensions/sqlite/driver/SqDriver.cpp @@ -57,7 +57,7 @@ int busy_handler(void *unused1, int unused2) { #if defined PLATFORM_WINDOWS Sleep(100); -#elif defined PLATFORM_LINUX +#elif defined PLATFORM_POSIX usleep(100000); #endif return 1; diff --git a/extensions/tf2/CDetour/detourhelpers.h b/extensions/tf2/CDetour/detourhelpers.h index 1ecf3a1a..85cda0ea 100644 --- a/extensions/tf2/CDetour/detourhelpers.h +++ b/extensions/tf2/CDetour/detourhelpers.h @@ -32,7 +32,7 @@ #ifndef _INCLUDE_SOURCEMOD_DETOURHELPERS_H_ #define _INCLUDE_SOURCEMOD_DETOURHELPERS_H_ -#if defined PLATFORM_LINUX || defined PLATFORM_APPLE +#if defined PLATFORM_POSIX #include #define PAGE_SIZE 4096 #define ALIGN(ar) ((long)ar & ~(PAGE_SIZE-1)) @@ -52,7 +52,7 @@ struct patch_t inline void ProtectMemory(void *addr, int length, int prot) { -#if defined PLATFORM_LINUX +#if defined PLATFORM_POSIX void *addr2 = (void *)ALIGN(addr); mprotect(addr2, sysconf(_SC_PAGESIZE), prot); #elif defined PLATFORM_WINDOWS