--- a/configure.in	Sat Aug 21 02:06:30 2004 +0000
+++ b/configure.in	Sat Aug 21 03:21:44 2004 +0000
@@ -490,29 +490,6 @@
     fi
 }
 
-dnl Check whether we want to use CoreAudio
-CheckCoreAudio()
-{
-    if test x$enable_audio = xyes; then
-        AC_MSG_CHECKING(for CoreAudio audio support)
-        have_coreaudio=no
-        AC_TRY_COMPILE([
-          #include <AudioUnit/AudioUnit.h>
-        ],[
-          AudioUnitInputCallback callback;
-        ],[
-        have_coreaudio=yes
-        ])
-        AC_MSG_RESULT($have_coreaudio)
-        # Set up files for the audio library
-        if test x$have_coreaudio = xyes; then
-            CFLAGS="$CFLAGS -DCOREAUDIO_SUPPORT"
-            AUDIO_SUBDIRS="$AUDIO_SUBDIRS macosx"
-            AUDIO_DRIVERS="$AUDIO_DRIVERS macosx/libaudio_macosx.la"
-        fi
-    fi
-}
-
 dnl See if we can use x86 assembly blitters
 # NASM is available from: http://nasm.octium.net/
 CheckNASM()
@@ -2531,7 +2508,6 @@
         ARCH=macosx
         CheckDummyVideo
         CheckDiskAudio
-        CheckCoreAudio
         CheckQUARTZ
         CheckMacGL
         CheckPTHREAD
@@ -2542,6 +2518,8 @@
         fi
         # Set up files for the audio library
         if test x$enable_audio = xyes; then
+            AUDIO_SUBDIRS="$AUDIO_SUBDIRS macosx"
+            AUDIO_DRIVERS="$AUDIO_DRIVERS macosx/libaudio_macosx.la"
             AUDIO_SUBDIRS="$AUDIO_SUBDIRS macrom"
             AUDIO_DRIVERS="$AUDIO_DRIVERS macrom/libaudio_macrom.la"
         fi

--- a/src/audio/SDL_audio.c	Sat Aug 21 02:06:30 2004 +0000
+++ b/src/audio/SDL_audio.c	Sat Aug 21 03:21:44 2004 +0000
@@ -77,7 +77,7 @@
 #ifdef __BEOS__
 	&BAUDIO_bootstrap,
 #endif
-#ifdef COREAUDIO_SUPPORT
+#ifdef MACOSX
 	&COREAUDIO_bootstrap,
 #endif
 #if defined(macintosh) || TARGET_API_MAC_CARBON

--- a/src/audio/SDL_sysaudio.h	Sat Aug 21 02:06:30 2004 +0000
+++ b/src/audio/SDL_sysaudio.h	Sat Aug 21 03:21:44 2004 +0000
@@ -144,7 +144,7 @@
 #ifdef __BEOS__
 extern AudioBootStrap BAUDIO_bootstrap;
 #endif
-#ifdef COREAUDIO_SUPPORT
+#ifdef MACOSX
 extern AudioBootStrap COREAUDIO_bootstrap;
 #endif
 #if defined(macintosh) || TARGET_API_MAC_CARBON

--- a/src/audio/macosx/SDL_coreaudio.c	Sat Aug 21 02:06:30 2004 +0000
+++ b/src/audio/macosx/SDL_coreaudio.c	Sat Aug 21 03:21:44 2004 +0000
@@ -165,7 +165,7 @@
 void Core_CloseAudio(_THIS)
 {
     OSStatus result;
-    AudioUnitInputCallback callback;
+    struct AudioUnitInputCallback callback;
 
     /* stop processing the audio unit */
     result = AudioOutputUnitStop (outputAudioUnit);
@@ -209,7 +209,7 @@
     OSStatus result = noErr;
     Component comp;
     ComponentDescription desc;
-    AudioUnitInputCallback callback;
+    struct AudioUnitInputCallback callback;
     AudioStreamBasicDescription requestedDesc;
 
     /* Setup a AudioStreamBasicDescription with the requested format */