DARWIN -> __MACOSX__

2005-06-21 08:56:36 +00:00
parent 1795ac93c1
commit 99387583f9
19 changed files with 31 additions and 34 deletions
@@ -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
 {
@@ -7,7 +7,7 @@
 #include <windows.h>
 #endif

-#if !defined(DARWIN)
+#if !defined(__MACOSX__)
 # include <GL/gl.h>
 # include <GL/glu.h>
 #else
@@ -34,7 +34,7 @@
 #include <set>
 #include <sstream>

-#if defined(DARWIN)
+#if defined(__MACOSX__)
 #include "archutils/Darwin/Vsync.h"
 #endif

@@ -8,7 +8,7 @@

 #include <set>

-#if !defined(DARWIN)
+#if !defined(__MACOSX__)
 # include <GL/gl.h>
 # include <GL/glu.h>
 #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

@@ -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, <zlib.h> 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.
@@ -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 );
@@ -13,7 +13,7 @@
 #include "arch/Dialog/Dialog.h"
 #include <float.h>

-#if defined(DARWIN)
+#if defined(__MACOSX__)
 # include <vecLib/vBLAS.h>
 #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
@@ -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
@@ -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);
@@ -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)) ||
@@ -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)
@@ -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;
@@ -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
@@ -8,6 +8,7 @@ typedef unsigned long long UInt64;
 #define __TYPES__
 #include <libkern/OSByteOrder.h>
 #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
@@ -14,7 +14,7 @@ struct BacktraceContext
 	pid_t pid;
 #endif

-#if defined(DARWIN)
+#if defined(__MACOSX__)
 	void *FramePtr, *PC;
 #endif
 };
@@ -12,7 +12,7 @@

 #include "RageUtil.h"

-#if defined(DARWIN)
+#if defined(__MACOSX__)
 #include "archutils/Darwin/Crash.h"
 #endif

@@ -19,7 +19,7 @@
 #include "CrashHandler.h"
 #include "CrashHandlerInternal.h"

-#if defined(DARWIN)
+#if defined(__MACOSX__)
 # include "../Darwin/DarwinThreadHelpers.h"
 #endif

@@ -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 );
@@ -14,7 +14,7 @@
 #include <sys/mman.h>
 #include <cerrno>

-#if defined(DARWIN)
+#if defined(__MACOSX__)
 extern "C" int sigaltstack( const struct sigaltstack *ss, struct sigaltstack *oss );
 #define MAP_ANONYMOUS MAP_ANON
 #endif
@@ -9,7 +9,7 @@
 #  include <unistd.h>
 #endif

-#if defined(CRASH_HANDLER) && (defined(LINUX) || defined(DARWIN))
+#if defined(CRASH_HANDLER) && (defined(LINUX) || defined(__MACOSX__))
 #include "archutils/Unix/CrashHandler.h"
 #endif