summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Howard2007-08-19 23:54:27 +0000
committerSimon Howard2007-08-19 23:54:27 +0000
commit241399e4037ec2add225daff2050ad433c9fbcdc (patch)
tree1753e6d0cc3d2168e8ef06740985df687e0be712
parent811354744695f53003995c210fd7aff1391933ad (diff)
downloadchocolate-doom-241399e4037ec2add225daff2050ad433c9fbcdc.tar.gz
chocolate-doom-241399e4037ec2add225daff2050ad433c9fbcdc.tar.bz2
chocolate-doom-241399e4037ec2add225daff2050ad433c9fbcdc.zip
Use __APPLE__ instead of __MACOSX__.
Subversion-branch: /trunk/chocolate-doom Subversion-revision: 957
-rw-r--r--src/i_sdlmusic.c2
-rw-r--r--src/s_sound.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/i_sdlmusic.c b/src/i_sdlmusic.c
index 28c8f60f..313e2a58 100644
--- a/src/i_sdlmusic.c
+++ b/src/i_sdlmusic.c
@@ -85,7 +85,7 @@ static boolean I_SDL_InitMusic(void)
// When trying to run with music enabled on OSX, display
// a warning message.
-#ifdef __MACOSX__
+#ifdef __APPLE__
printf("\n"
" *** WARNING ***\n"
" Music playback on OSX may cause crashes and\n"
diff --git a/src/s_sound.c b/src/s_sound.c
index 8c311009..e367fafc 100644
--- a/src/s_sound.c
+++ b/src/s_sound.c
@@ -71,7 +71,7 @@
// Disable music on OSX by default; there are problems with SDL_mixer.
-#ifndef __MACOSX__
+#ifndef __APPLE__
#define DEFAULT_MUSIC_DEVICE SNDDEVICE_SB
#else
#define DEFAULT_MUSIC_DEVICE SNDDEVICE_NONE