From 99387583f9c7c5df7d7279379766637039ac361a Mon Sep 17 00:00:00 2001 From: Steve Checkoway Date: Tue, 21 Jun 2005 08:56:36 +0000 Subject: [PATCH] DARWIN -> __MACOSX__ --- stepmania/src/LuaManager.cpp | 5 ----- stepmania/src/RageDisplay_OGL.cpp | 4 ++-- stepmania/src/RageDisplay_OGL_Extensions.cpp | 4 ++-- stepmania/src/RageFileDriverDeflate.cpp | 2 +- stepmania/src/RageFileManager.cpp | 4 ++-- stepmania/src/RageMath.cpp | 6 +++--- stepmania/src/RageThreads.cpp | 2 +- stepmania/src/SDL_utils.cpp | 2 +- stepmania/src/StepMania.cpp | 2 +- stepmania/src/arch/ArchHooks/Selector_ArchHooks.h | 2 +- stepmania/src/arch/Threads/Threads_Pthreads.cpp | 6 +++--- stepmania/src/arch/arch_platform.h | 6 +++--- stepmania/src/archutils/Darwin/arch_setup.h | 2 ++ stepmania/src/archutils/Unix/Backtrace.h | 2 +- stepmania/src/archutils/Unix/BacktraceNames.cpp | 2 +- stepmania/src/archutils/Unix/CrashHandler.cpp | 2 +- stepmania/src/archutils/Unix/CrashHandlerChild.cpp | 8 ++++---- stepmania/src/archutils/Unix/SignalHandler.cpp | 2 +- stepmania/src/global.cpp | 2 +- 19 files changed, 31 insertions(+), 34 deletions(-) diff --git a/stepmania/src/LuaManager.cpp b/stepmania/src/LuaManager.cpp index c74129917c..c61cb7d83f 100644 --- a/stepmania/src/LuaManager.cpp +++ b/stepmania/src/LuaManager.cpp @@ -27,11 +27,6 @@ static LuaFunctionList *g_LuaFunctions = NULL; * We don't care; we'll throw a fatal exception immediately anyway. */ #pragma warning (disable : 4611) #endif -#if defined (DARWIN) - extern void NORETURN longjmp(jmp_buf env, int val); -#endif - - struct ChunkReaderData { diff --git a/stepmania/src/RageDisplay_OGL.cpp b/stepmania/src/RageDisplay_OGL.cpp index adbb3b2c1c..f2de1fea68 100644 --- a/stepmania/src/RageDisplay_OGL.cpp +++ b/stepmania/src/RageDisplay_OGL.cpp @@ -7,7 +7,7 @@ #include #endif -#if !defined(DARWIN) +#if !defined(__MACOSX__) # include # include #else @@ -34,7 +34,7 @@ #include #include -#if defined(DARWIN) +#if defined(__MACOSX__) #include "archutils/Darwin/Vsync.h" #endif diff --git a/stepmania/src/RageDisplay_OGL_Extensions.cpp b/stepmania/src/RageDisplay_OGL_Extensions.cpp index 87558ddbf4..892c8f50d3 100644 --- a/stepmania/src/RageDisplay_OGL_Extensions.cpp +++ b/stepmania/src/RageDisplay_OGL_Extensions.cpp @@ -8,7 +8,7 @@ #include -#if !defined(DARWIN) +#if !defined(__MACOSX__) # include # include #else @@ -88,7 +88,7 @@ void GLExt_t::Load( LowLevelWindow *pWind ) #if defined(WIN32) if( HasExtension("WGL_EXT_swap_control") ) wglSwapIntervalEXT = (PWSWAPINTERVALEXTPROC) pWind->GetProcAddress("wglSwapIntervalEXT"); -#elif defined(DARWIN) +#elif defined(__MACOSX__) wglSwapIntervalEXT = wglSwapIntervalEXT; #endif diff --git a/stepmania/src/RageFileDriverDeflate.cpp b/stepmania/src/RageFileDriverDeflate.cpp index 44287cf3d4..b989e4af32 100644 --- a/stepmania/src/RageFileDriverDeflate.cpp +++ b/stepmania/src/RageFileDriverDeflate.cpp @@ -8,7 +8,7 @@ #if defined(_MSC_VER) || defined(_XBOX) #include "zlib/zlib.h" #pragma comment(lib, "zlib/zdll.lib") -#elif defined(DARWIN) +#elif defined(__MACOSX__) /* Since crypto++ was added to the repository, includes the zlib.h * in there rather than the correct system one. I don't know why it would do * this since crypto51 is not being listed as one of the include directories. diff --git a/stepmania/src/RageFileManager.cpp b/stepmania/src/RageFileManager.cpp index fd960021fd..1c52c2f086 100644 --- a/stepmania/src/RageFileManager.cpp +++ b/stepmania/src/RageFileManager.cpp @@ -219,7 +219,7 @@ static void ChangeToDirOfExecutable( CString argv0 ) * written through RageFile. See also RageFileManager::RageFileManager. */ #if defined(_WINDOWS) chdir( DirOfExecutable + "/.." ); -#elif defined(DARWIN) +#elif defined(__MACOSX__) chdir(DirOfExecutable + "/../../.."); #endif } @@ -296,7 +296,7 @@ void RageFileManager::MountInitialFilesystems() ASSERT_M( parts.size() > 1, ssprintf("Strange DirOfExecutable: %s", DirOfExecutable.c_str()) ); CString Dir = join( "/", parts.begin(), parts.end()-1 ); RageFileManager::Mount( "dir", Dir, "/" ); -#elif defined(DARWIN) +#elif defined(__MACOSX__) CHECKPOINT_M( ssprintf("DOE \"%s\"", DirOfExecutable.c_str()) ); CStringArray parts; split( DirOfExecutable, "/", parts ); diff --git a/stepmania/src/RageMath.cpp b/stepmania/src/RageMath.cpp index fba145c550..60c9c665fc 100644 --- a/stepmania/src/RageMath.cpp +++ b/stepmania/src/RageMath.cpp @@ -13,7 +13,7 @@ #include "arch/Dialog/Dialog.h" #include -#if defined(DARWIN) +#if defined(__MACOSX__) # include #endif @@ -81,7 +81,7 @@ void RageVec3TransformNormal( RageVector3* pOut, const RageVector3* pV, const Ra void RageVec4TransformCoord( RageVector4* pOut, const RageVector4* pV, const RageMatrix* pM ) { -#if defined(DARWIN) +#if defined(__MACOSX__) // (M^t * v)^t = v^t * M cblas_sgemv(CblasRowMajor, CblasTrans, 4, 4, 1, &pM->m00, 4, &pV->x, 1, 0, &pOut->x, 1); @@ -126,7 +126,7 @@ RageMatrix RageMatrix::GetTranspose() const void RageMatrixMultiply( RageMatrix* pOut, const RageMatrix* pA, const RageMatrix* pB ) { -#if defined(DARWIN) +#if defined(__MACOSX__) cblas_sgemm(CblasRowMajor, CblasNoTrans, CblasNoTrans, 4, 4, 4, 1, &pB->m00, 4, &pA->m00, 4, 0, &pOut->m00, 4); #else diff --git a/stepmania/src/RageThreads.cpp b/stepmania/src/RageThreads.cpp index 8916e34af3..3936ff80e7 100644 --- a/stepmania/src/RageThreads.cpp +++ b/stepmania/src/RageThreads.cpp @@ -25,7 +25,7 @@ #if defined(CRASH_HANDLER) #if defined(_WINDOWS) #include "archutils/Win32/crash.h" -#elif defined(LINUX) || defined(DARWIN) +#elif defined(LINUX) || defined(__MACOSX__) #include "archutils/Unix/CrashHandler.h" #endif #endif diff --git a/stepmania/src/SDL_utils.cpp b/stepmania/src/SDL_utils.cpp index c62967dd66..f2b681e86f 100644 --- a/stepmania/src/SDL_utils.cpp +++ b/stepmania/src/SDL_utils.cpp @@ -92,7 +92,7 @@ CString mySDL_GetError() void mySDL_WM_SetIcon( CString sIconFile ) { -#if !defined(DARWIN) +#if !defined(__MACOSX__) if( sIconFile.empty() ) { SDL_WM_SetIcon(NULL, NULL); diff --git a/stepmania/src/StepMania.cpp b/stepmania/src/StepMania.cpp index e9b6d2384f..1066f938ff 100644 --- a/stepmania/src/StepMania.cpp +++ b/stepmania/src/StepMania.cpp @@ -1318,7 +1318,7 @@ bool HandleGlobalInputs( DeviceInput DeviceI, InputEventType type, GameInput Gam return false; // Attract need to know because they go to TitleMenu on > 1 credit } -#ifndef DARWIN +#ifndef __MACOSX__ if(DeviceI == DeviceInput(DEVICE_KEYBOARD, KEY_F4)) { if( INPUTFILTER->IsBeingPressed( DeviceInput(DEVICE_KEYBOARD, KEY_RALT)) || diff --git a/stepmania/src/arch/ArchHooks/Selector_ArchHooks.h b/stepmania/src/arch/ArchHooks/Selector_ArchHooks.h index 8d3dab4238..ca97528469 100644 --- a/stepmania/src/arch/ArchHooks/Selector_ArchHooks.h +++ b/stepmania/src/arch/ArchHooks/Selector_ArchHooks.h @@ -4,7 +4,7 @@ #include "arch/arch_platform.h" /* ArchHooks driver selector. */ -#if defined(HAVE_DARWIN) +#if defined(HAVE_MACOSX) #include "ArchHooks_darwin.h" #elif defined(HAVE_UNIX) diff --git a/stepmania/src/arch/Threads/Threads_Pthreads.cpp b/stepmania/src/arch/Threads/Threads_Pthreads.cpp index cd3eb397d7..b05b121607 100644 --- a/stepmania/src/arch/Threads/Threads_Pthreads.cpp +++ b/stepmania/src/arch/Threads/Threads_Pthreads.cpp @@ -11,7 +11,7 @@ #include "archutils/Unix/RunningUnderValgrind.h" #endif -#if defined(DARWIN) +#if defined(__MACOSX__) #include "archutils/Darwin/DarwinThreadHelpers.h" #endif @@ -106,7 +106,7 @@ MutexImpl_Pthreads::~MutexImpl_Pthreads() } -#if defined(HAVE_PTHREAD_MUTEX_TIMEDLOCK) || defined(DARWIN) +#if defined(HAVE_PTHREAD_MUTEX_TIMEDLOCK) || defined(__MACOSX__) static bool UseTimedlock() { #if defined(LINUX) @@ -337,7 +337,7 @@ void SemaImpl_Pthreads::Post() bool SemaImpl_Pthreads::Wait() { -#if defined(HAVE_PTHREAD_MUTEX_TIMEDLOCK) || defined(DARWIN) +#if defined(HAVE_PTHREAD_MUTEX_TIMEDLOCK) || defined(__MACOSX__) if( UseTimedlock() ) { timeval tv; diff --git a/stepmania/src/arch/arch_platform.h b/stepmania/src/arch/arch_platform.h index 4ab2755114..3611fb7b2b 100644 --- a/stepmania/src/arch/arch_platform.h +++ b/stepmania/src/arch/arch_platform.h @@ -3,11 +3,11 @@ // In here, you define which APIs are guaranteed to be available on which OSes. // Don't ever actually #include anything here -- that's for */Selector_*.h. -#if defined(UNIX) && !defined(DARWIN) +#if defined(UNIX) && !defined(__MACOSX__) #define HAVE_UNIX #endif -#if defined(DARWIN) -#define HAVE_DARWIN +#if defined(__MACOSX__) +#define HAVE_MACOSX #define HAVE_COCOA #define HAVE_COREAUDIO #define HAVE_SDL diff --git a/stepmania/src/archutils/Darwin/arch_setup.h b/stepmania/src/archutils/Darwin/arch_setup.h index 720d6f9239..8a19d4a9ad 100644 --- a/stepmania/src/archutils/Darwin/arch_setup.h +++ b/stepmania/src/archutils/Darwin/arch_setup.h @@ -8,6 +8,7 @@ typedef unsigned long long UInt64; #define __TYPES__ #include #undef __TYPES__ +#if 0 #define DARWIN 1 #define NEED_POWF #define NEED_SQRTF @@ -16,6 +17,7 @@ typedef unsigned long long UInt64; #define NEED_TANF #define NEED_ACOSF #define NEED_STRTOF +#endif #define BACKTRACE_LOOKUP_METHOD_DARWIN_DYLD #define BACKTRACE_METHOD_POWERPC_DARWIN #define HAVE_VERSION_INFO diff --git a/stepmania/src/archutils/Unix/Backtrace.h b/stepmania/src/archutils/Unix/Backtrace.h index 5500951056..02a62353e8 100644 --- a/stepmania/src/archutils/Unix/Backtrace.h +++ b/stepmania/src/archutils/Unix/Backtrace.h @@ -14,7 +14,7 @@ struct BacktraceContext pid_t pid; #endif -#if defined(DARWIN) +#if defined(__MACOSX__) void *FramePtr, *PC; #endif }; diff --git a/stepmania/src/archutils/Unix/BacktraceNames.cpp b/stepmania/src/archutils/Unix/BacktraceNames.cpp index 1679854725..2a44282068 100644 --- a/stepmania/src/archutils/Unix/BacktraceNames.cpp +++ b/stepmania/src/archutils/Unix/BacktraceNames.cpp @@ -12,7 +12,7 @@ #include "RageUtil.h" -#if defined(DARWIN) +#if defined(__MACOSX__) #include "archutils/Darwin/Crash.h" #endif diff --git a/stepmania/src/archutils/Unix/CrashHandler.cpp b/stepmania/src/archutils/Unix/CrashHandler.cpp index fd200add17..3d5e4fb257 100644 --- a/stepmania/src/archutils/Unix/CrashHandler.cpp +++ b/stepmania/src/archutils/Unix/CrashHandler.cpp @@ -19,7 +19,7 @@ #include "CrashHandler.h" #include "CrashHandlerInternal.h" -#if defined(DARWIN) +#if defined(__MACOSX__) # include "../Darwin/DarwinThreadHelpers.h" #endif diff --git a/stepmania/src/archutils/Unix/CrashHandlerChild.cpp b/stepmania/src/archutils/Unix/CrashHandlerChild.cpp index 8c974f677f..13170f8303 100644 --- a/stepmania/src/archutils/Unix/CrashHandlerChild.cpp +++ b/stepmania/src/archutils/Unix/CrashHandlerChild.cpp @@ -16,7 +16,7 @@ #include "RageLog.h" /* for RageLog::GetAdditionalLog, etc. only */ #include "ProductInfo.h" -#if defined(DARWIN) +#if defined(__MACOSX__) #include "archutils/Darwin/Crash.h" #endif @@ -58,7 +58,7 @@ static void output_stack_trace( FILE *out, const void **BacktracePointers ) } } -#if !defined(DARWIN) +#if !defined(__MACOSX__) const char *SignalCodeName( int signo, int code ) { switch( code ) @@ -289,7 +289,7 @@ static void child_process() { CString Signal = SignalName( crash.signal ); -#if !defined(DARWIN) +#if !defined(__MACOSX__) reason = ssprintf( "%s - %s", Signal.c_str(), SignalCodeName(crash.signal, crash.si.si_code) ); #else reason = Signal; @@ -340,7 +340,7 @@ static void child_process() fprintf(CrashDump, "-- End of report\n"); fclose(CrashDump); -#if defined(DARWIN) +#if defined(__MACOSX__) /* Forcibly kill our parent. */ kill( getppid(), SIGKILL ); InformUserOfCrash( sCrashInfoPath ); diff --git a/stepmania/src/archutils/Unix/SignalHandler.cpp b/stepmania/src/archutils/Unix/SignalHandler.cpp index 81c1a96221..d1cc68bd38 100644 --- a/stepmania/src/archutils/Unix/SignalHandler.cpp +++ b/stepmania/src/archutils/Unix/SignalHandler.cpp @@ -14,7 +14,7 @@ #include #include -#if defined(DARWIN) +#if defined(__MACOSX__) extern "C" int sigaltstack( const struct sigaltstack *ss, struct sigaltstack *oss ); #define MAP_ANONYMOUS MAP_ANON #endif diff --git a/stepmania/src/global.cpp b/stepmania/src/global.cpp index cf50301785..eef7a8082f 100644 --- a/stepmania/src/global.cpp +++ b/stepmania/src/global.cpp @@ -9,7 +9,7 @@ # include #endif -#if defined(CRASH_HANDLER) && (defined(LINUX) || defined(DARWIN)) +#if defined(CRASH_HANDLER) && (defined(LINUX) || defined(__MACOSX__)) #include "archutils/Unix/CrashHandler.h" #endif