[Java-game-lib-cvs] SF.net SVN: java-game-lib: [2652] trunk/LWJGL/src/native/common/fmod3

Revision: 2652
          http://svn.sourceforge.net/java-game-lib/?rev=2652&view=rev
Author:   matzon
Date:     2006-11-18 13:28:17 -0800 (Sat, 18 Nov 2006)

Log Message:
-----------
using __APPLE__ && __MACH__ instead of _MACOSX

Modified Paths:
--------------
    trunk/LWJGL/src/native/common/fmod3/extfmod3.h
    trunk/LWJGL/src/native/common/fmod3/org_lwjgl_fmod3_FSound.c

Modified: trunk/LWJGL/src/native/common/fmod3/extfmod3.h
===================================================================
--- trunk/LWJGL/src/native/common/fmod3/extfmod3.h	2006-11-18 21:20:41 UTC (rev 2651)
+++ trunk/LWJGL/src/native/common/fmod3/extfmod3.h	2006-11-18 21:28:17 UTC (rev 2652)
@@ -36,10 +36,10 @@
 #include <jni.h>
 #include "../common_tools.h"
 
-#ifdef _MACOSX
-#include "fmoddyn_mac.h"
+#ifdef __APPLE__ && __MACH__
+	#include "fmoddyn_mac.h"
 #else
-#include "fmoddyn.h"
+	#include "fmoddyn.h"
 #endif
 #include "fmod_errors.h"
 

Modified: trunk/LWJGL/src/native/common/fmod3/org_lwjgl_fmod3_FSound.c
===================================================================
--- trunk/LWJGL/src/native/common/fmod3/org_lwjgl_fmod3_FSound.c	2006-11-18 21:20:41 UTC (rev 2651)
+++ trunk/LWJGL/src/native/common/fmod3/org_lwjgl_fmod3_FSound.c	2006-11-18 21:28:17 UTC (rev 2652)
@@ -1391,7 +1391,7 @@
 * Signature: (C)Z
 */
 JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod3_FSound_FSOUND_1CD_1OpenTray(JNIEnv * env, jclass clazz, jchar drive, jboolean open) {
-#ifdef _MACOSX
+#ifdef __APPLE__ && __MACH__
   return false;
 #else
   return fmod_instance->FSOUND_CD_OpenTray(drive, open);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.