foxygit / doom Log in
commit 241399e4037ec2add225daff2050ad433c9fbcdc
Author:     Simon Howard <fraggle@gmail.com>
AuthorDate: Sun Aug 19 23:54:27 2007 +0000
Commit:     Simon Howard <fraggle@gmail.com>
CommitDate: Sun Aug 19 23:54:27 2007 +0000

    Use __APPLE__ instead of __MACOSX__.

    Subversion-branch: /trunk/chocolate-doom
    Subversion-revision: 957
---
 src/i_sdlmusic.c | 2 +-
 src/s_sound.c    | 2 +-
 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