--- a/configure.in	Tue Feb 21 08:34:45 2006 +0000
+++ b/configure.in	Tue Feb 21 08:46:50 2006 +0000
@@ -57,10 +57,10 @@
 case "$target" in
     *-*-cygwin*)
         # We build SDL on cygwin without the UNIX emulation layer
-        CFLAGS="$CFLAGS -I/usr/include/mingw -DWIN32 -Uunix -mno-cygwin"
+        CFLAGS="$CFLAGS -I/usr/include/mingw -mno-cygwin"
         BUILD_CFLAGS="$CFLAGS \$(INCLUDE)"
         BUILD_LDFLAGS="$LDFLAGS -mno-cygwin"
-        SDL_CFLAGS="-I/usr/include/mingw -DWIN32 -Uunix -mno-cygwin"
+        SDL_CFLAGS="-I/usr/include/mingw -mno-cygwin"
         SDL_LIBS="-lSDL -mno-cygwin"
         ;;
     *)
@@ -239,11 +239,11 @@
 if test x$enable_cpuinfo != xyes; then
     AC_DEFINE(SDL_CPUINFO_DISABLED)
 fi
-AC_ARG_ENABLE(assembly-blit,
-AC_HELP_STRING([--enable-asm-blit], [Enable assembly blitters [default=yes]]),
-              , enable_asm_blit=yes)
-if test x$enable_asm_blit = xyes; then
-    AC_DEFINE(SDL_ASSEMBLY_BLITTERS)
+AC_ARG_ENABLE(assembly,
+AC_HELP_STRING([--enable-assembly], [Enable assembly routines [default=yes]]),
+              , enable_assembly=yes)
+if test x$enable_assembly = xyes; then
+    AC_DEFINE(SDL_ASSEMBLY_ROUTINES)
 fi
 
 dnl See if the OSS audio interface is supported
@@ -559,7 +559,7 @@
     AC_ARG_ENABLE(nasm,
 AC_HELP_STRING([--enable-nasm], [use nasm assembly blitters on x86 [default=yes]]),
                   , enable_nasm=yes)
-    if test x$enable_video = xyes -a x$enable_asm_blit = xyes -a x$enable_nasm = xyes; then
+    if test x$enable_video = xyes -a x$enable_assembly = xyes -a x$enable_nasm = xyes; then
         AC_PATH_PROG(NASM, nasm)
         if test x$NASM != x -a x$NASM != x'"$NASM"'; then
             AC_DEFINE(SDL_HERMES_BLITTERS)
@@ -595,7 +595,7 @@
     AC_ARG_ENABLE(altivec,
 AC_HELP_STRING([--enable-altivec], [use altivec assembly blitters on PPC [default=yes]]),
                   , enable_altivec=yes)
-    if test x$enable_video = xyes -a x$enable_asm_blit = xyes -a x$enable_altivec = xyes; then
+    if test x$enable_video = xyes -a x$enable_assembly = xyes -a x$enable_altivec = xyes; then
         have_altivec_h_hdr=no
         AC_CHECK_HEADER(altivec.h, have_altivec_h_hdr=yes)
 
@@ -2012,13 +2012,6 @@
             SOURCES="$SOURCES $srcdir/src/timer/unix/*.c"
             have_timers=yes
         fi
-        # Do any final platform setup
-        case $ARCH in
-            openbsd|netbsd)
-                # OpenBSD and NetBSD do not define "unix"
-                BUILD_CFLAGS="$BUILD_CFLAGS -Dunix"
-            ;;
-        esac
         ;;
     *-*-qnx*)
         ARCH=qnx
@@ -2221,8 +2214,7 @@
         fi
         # The MacOS X platform requires special setup.
         SDLMAIN_SOURCES="$srcdir/src/main/macosx/*.m"
-        AC_DEFINE(TARGET_API_MAC_CARBON)
-        BUILD_CFLAGS="$BUILD_CFLAGS -fpascal-strings -DMACOSX"
+        BUILD_CFLAGS="$BUILD_CFLAGS -fpascal-strings"
         SDL_LIBS="-lSDLmain $SDL_LIBS"
         if test x$enable_video_cocoa = xyes; then
             BUILD_LDFLAGS="$BUILD_LDFLAGS -framework Cocoa"
@@ -2279,8 +2271,6 @@
             fi
             have_timers=yes
         fi
-        # MiNT does not define "unix"
-        BUILD_CFLAGS="$BUILD_CFLAGS -Dunix"
         ;;
     *-riscos)
         ARCH=riscos

--- a/include/SDL_config.h	Tue Feb 21 08:34:45 2006 +0000
+++ b/include/SDL_config.h	Tue Feb 21 08:46:50 2006 +0000
@@ -25,6 +25,8 @@
 
 /* This is the minimal configuration that can be used to build SDL */
 
+#include "SDL_platform.h"
+
 #include <stdarg.h>
 
 typedef signed char int8_t;

--- a/include/SDL_config.h.in	Tue Feb 21 08:34:45 2006 +0000
+++ b/include/SDL_config.h.in	Tue Feb 21 08:46:50 2006 +0000
@@ -25,6 +25,9 @@
 
 /* This is a set of defines to configure the SDL features */
 
+/* General platform specific identifiers */
+#include "SDL_platform.h"
+
 /* C language features */
 #undef const
 #undef inline
@@ -48,7 +51,7 @@
 
 /* Comment this if you want to build without any C library requirements */
 #undef HAVE_LIBC
-#ifdef HAVE_LIBC
+#if HAVE_LIBC
 
 /* Useful headers */
 #undef HAVE_ALLOCA_H
@@ -127,10 +130,6 @@
 #include <stdarg.h>
 #endif /* HAVE_LIBC */
 
-/* General platform specific identifiers */
-#undef TARGET_API_MAC_CARBON
-#undef TARGET_API_MAC_OSX
-
 /* Allow disabling of core subsystems */
 #undef SDL_AUDIO_DISABLED
 #undef SDL_CDROM_DISABLED
@@ -155,7 +154,6 @@
 #undef SDL_AUDIO_DRIVER_DC
 #undef SDL_AUDIO_DRIVER_DISK
 #undef SDL_AUDIO_DRIVER_DMEDIA
-#undef SDL_AUDIO_DRIVER_DRENDERER
 #undef SDL_AUDIO_DRIVER_DSOUND
 #undef SDL_AUDIO_DRIVER_ESD
 #undef SDL_AUDIO_DRIVER_ESD_DYNAMIC
@@ -285,8 +283,8 @@
 #undef SDL_VIDEO_OPENGL_OSMESA
 #undef SDL_VIDEO_OPENGL_OSMESA_DYNAMIC
 
-/* Enable assembly blit routines */
-#undef SDL_ASSEMBLY_BLITTERS
+/* Enable assembly routines */
+#undef SDL_ASSEMBLY_ROUTINES
 #undef SDL_HERMES_BLITTERS
 #undef SDL_ALTIVEC_BLITTERS
 

--- a/include/SDL_config.h.minimal	Tue Feb 21 08:34:45 2006 +0000
+++ b/include/SDL_config.h.minimal	Tue Feb 21 08:46:50 2006 +0000
@@ -25,6 +25,8 @@
 
 /* This is the minimal configuration that can be used to build SDL */
 
+#include "SDL_platform.h"
+
 #include <stdarg.h>
 
 typedef signed char int8_t;

--- a/include/SDL_cpuinfo.h	Tue Feb 21 08:34:45 2006 +0000
+++ b/include/SDL_cpuinfo.h	Tue Feb 21 08:46:50 2006 +0000
@@ -23,11 +23,11 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 /* CPU feature detection for SDL                                       */
 
-#include "SDL_stdinc.h"
-
 #ifndef _SDL_cpuinfo_h
 #define _SDL_cpuinfo_h
 
+#include "SDL_stdinc.h"
+
 #include "begin_code.h"
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus

--- a/include/SDL_main.h	Tue Feb 21 08:34:45 2006 +0000
+++ b/include/SDL_main.h	Tue Feb 21 08:46:50 2006 +0000
@@ -27,9 +27,9 @@
 
 /* Redefine main() on Win32 and MacOS so that it is called by winmain.c */
 
-#if defined(WIN32) || defined(_WIN32) || \
+#if defined(__WIN32__) || \
     (defined(__MWERKS__) && !defined(__BEOS__)) || \
-    defined(macintosh) || defined(__APPLE__) || \
+    defined(__MACOS__) || defined(__MACOSX__) || \
     defined(__SYMBIAN32__) || defined(QWS)
 
 #ifdef __cplusplus
@@ -54,7 +54,7 @@
 
 
 /* From the SDL library code -- needed for registering the app on Win32 */
-#if defined(WIN32)
+#ifdef __WIN32__
 
 #include "begin_code.h"
 #ifdef __cplusplus
@@ -74,7 +74,7 @@
 #endif
 
 /* From the SDL library code -- needed for registering QuickDraw on MacOS */
-#if defined(macintosh)
+#if defined(__MACOS__)
 
 #include "begin_code.h"
 #ifdef __cplusplus

--- a/include/SDL_opengl.h	Tue Feb 21 08:34:45 2006 +0000
+++ b/include/SDL_opengl.h	Tue Feb 21 08:46:50 2006 +0000
@@ -22,7 +22,9 @@
 
 /* This is a simple file to encapsulate the OpenGL API headers */
 
-#ifdef WIN32
+#include "SDL_config.h"
+
+#ifdef __WIN32__
 #define WIN32_LEAN_AND_MEAN
 #ifndef NOMINMAX
 #define NOMINMAX	/* Don't defined min() and max() */
@@ -32,7 +34,7 @@
 #ifndef NO_SDL_GLEXT
 #define __glext_h_  /* Don't let gl.h include glext.h */
 #endif
-#if defined(__APPLE__) && defined(__MACH__)
+#ifdef __MACOSX__
 #include <OpenGL/gl.h>	/* Header File For The OpenGL Library */
 #include <OpenGL/glu.h>	/* Header File For The GLU Library */
 #else

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/include/SDL_platform.h	Tue Feb 21 08:46:50 2006 +0000
@@ -0,0 +1,104 @@
+/*
+    SDL - Simple DirectMedia Layer
+    Copyright (C) 1997-2006 Sam Lantinga
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+    Sam Lantinga
+    slouken@libsdl.org
+*/
+
+/* Try to get a standard set of platform defines */
+
+#if defined(_AIX)
+#undef __AIX__
+#define __AIX__		1
+#endif
+#if defined(AMIGA) || defined(__AMIGA) || defined(__amigados__)
+/* FIXME: is this the right test for AmigaOS? */
+#undef __AMIGA__
+#define __AMIGA__	1
+#endif
+#if defined(__BEOS__)
+#undef __BEOS__
+#define __BEOS__	1
+#endif
+#if defined(bsdi) || defined(__bsdi) || defined(__bsdi__)
+#undef __BSDI__
+#define __BSDI__	1
+#endif
+#if defined(DREAMCAST)
+/* FIXME: is this the right test for Dreamcast? */
+#undef __DREAMCAST__
+#define __DREAMCAST__	1
+#endif
+#if defined(__FreeBSD__)
+#undef __FREEBSD__
+#define __FREEBSD__	1
+#endif
+#if defined(hpux) || defined(__hpux) || defined(__hpux__)
+#undef __HPUX__
+#define __HPUX__	1
+#endif
+#if defined(sgi) || defined(__sgi) || defined(__sgi__) || defined(_SGI_SOURCE)
+#undef __IRIX__
+#define __IRIX__	1
+#endif
+#if defined(linux) || defined(__linux) || defined(__linux__)
+#undef __LINUX__
+#define __LINUX__	1
+#endif
+#if defined(macintosh)
+#undef __MACOS__
+#define __MACOS__	1
+#endif
+#if defined(__GNUC__) && (defined(__APPLE_CC__) || defined(__APPLE_CPP__))
+#undef __MACOSX__
+#define __MACOSX__	1
+#define TARGET_API_MAC_CARBON	1
+#endif
+#if defined(__NetBSD__)
+#undef __NETBSD__
+#define __NETBSD__	1
+#endif
+#if defined(__OpenBSD__)
+#undef __OPENBSD__
+#define __OPENBSD__	1
+#endif
+#if defined(__OS2__)
+#undef __OS2__
+#define __OS2__		1
+#endif
+#if defined(osf) || defined(__osf) || defined(__osf__) || defined(_OSF_SOURCE)
+#undef __OSF__
+#define __OSF__		1
+#endif
+#if defined(__QNXNTO__)
+#undef __QNXNTO__
+#define __QNXNTO__	1
+#endif
+#if defined(riscos) || defined(__riscos) || defined(__riscos__)
+#undef __RISCOS__
+#define __RISCOS__	1
+#endif
+#if defined(solaris) || defined(__solaris) || defined(__solaris__)
+/* FIXME: is this the right test for Solaris? Check SDL_sunaudio.c */
+#undef __SOLARIS__
+#define __SOLARIS__	1
+#endif
+#if defined(WIN32) || defined(_WIN32)
+#undef __WIN32__
+#define __WIN32__	1
+#endif

--- a/include/SDL_rwops.h	Tue Feb 21 08:34:45 2006 +0000
+++ b/include/SDL_rwops.h	Tue Feb 21 08:46:50 2006 +0000
@@ -24,8 +24,8 @@
    data sources.  It can easily be extended to files, memory, etc.
 */
 
-#ifndef _SDL_RWops_h
-#define _SDL_RWops_h
+#ifndef _SDL_rwops_h
+#define _SDL_rwops_h
 
 #include "SDL_stdinc.h"
 #include "SDL_error.h"
@@ -130,4 +130,4 @@
 #endif
 #include "close_code.h"
 
-#endif /* _SDL_RWops_h */
+#endif /* _SDL_rwops_h */

--- a/include/SDL_stdinc.h	Tue Feb 21 08:34:45 2006 +0000
+++ b/include/SDL_stdinc.h	Tue Feb 21 08:46:50 2006 +0000
@@ -159,12 +159,12 @@
 #if HAVE_ALLOCA && !defined(alloca)
 # if HAVE_ALLOCA_H
 #  include <alloca.h>
-# elif __GNUC__
+# elif defined(__GNUC__)
 #  define alloca __builtin_alloca
-# elif _MSC_VER
+# elif defined(_MSC_VER)
 #  include <malloc.h>
 #  define alloca _alloca
-# elif _AIX
+# elif defined(__AIX__)
   #pragma alloca
 # else
    char *alloca ();

--- a/include/SDL_thread.h	Tue Feb 21 08:34:45 2006 +0000
+++ b/include/SDL_thread.h	Tue Feb 21 08:46:50 2006 +0000
@@ -45,7 +45,7 @@
 typedef struct SDL_Thread SDL_Thread;
 
 /* Create a thread */
-#if defined(_WIN32) || defined(__OS2__)
+#if defined(__WIN32__) || defined(__OS2__)
 /*
    We compile SDL into a DLL on OS/2. This means, that it's the DLL which
    creates a new thread for the calling process with the SDL_CreateThread()

--- a/include/begin_code.h	Tue Feb 21 08:34:45 2006 +0000
+++ b/include/begin_code.h	Tue Feb 21 08:46:50 2006 +0000
@@ -31,11 +31,6 @@
 #endif
 #define _begin_code_h
 
-/* Make sure the correct platform symbols are defined */
-#if !defined(WIN32) && defined(_WIN32)
-#define WIN32
-#endif /* Windows */
-
 /* Some compilers use a special export keyword */
 #ifndef DECLSPEC
 # ifdef __BEOS__
@@ -45,7 +40,7 @@
 #   define DECLSPEC	__declspec(export)
 #  endif
 # else
-# ifdef WIN32
+# ifdef __WIN32__
 #  ifdef __BORLANDC__
 #   ifdef BUILD_SDL
 #    define DECLSPEC 
@@ -75,7 +70,7 @@
 
 /* By default SDL uses the C calling convention */
 #ifndef SDLCALL
-#if defined(WIN32) && !defined(__GNUC__)
+#if defined(__WIN32__) && !defined(__GNUC__)
 #define SDLCALL __cdecl
 #else
 #ifdef __OS2__
@@ -107,7 +102,7 @@
 #pragma nopackwarning
 #endif
 #pragma pack(push,4)
-#elif (defined(__MWERKS__) && defined(macintosh))
+#elif (defined(__MWERKS__) && defined(__MACOS__))
 #pragma options align=mac68k4byte
 #pragma enumsalwaysint on
 #endif /* Compiler needs structure packing set */

--- a/include/close_code.h	Tue Feb 21 08:34:45 2006 +0000
+++ b/include/close_code.h	Tue Feb 21 08:46:50 2006 +0000
@@ -31,7 +31,7 @@
 #ifdef __BORLANDC__
 #pragma nopackwarning
 #endif
-#if (defined(__MWERKS__) && defined(macintosh))
+#if (defined(__MWERKS__) && defined(__MACOS__))
 #pragma options align=reset
 #pragma enumsalwaysint reset
 #else

--- a/src/SDL.c	Tue Feb 21 08:34:45 2006 +0000
+++ b/src/SDL.c	Tue Feb 21 08:46:50 2006 +0000
@@ -19,6 +19,7 @@
     Sam Lantinga
     slouken@libsdl.org
 */
+#include "SDL_config.h"
 
 /* Initialization code for SDL */
 
@@ -322,7 +323,7 @@
 }
 #endif /* __WATCOMC__ */
 
-#elif defined(_WIN32)
+#elif defined(__WIN32__)
 
 #if !defined(HAVE_LIBC) || defined(_WIN32_WCE) || (defined(__WATCOMC__) && defined(BUILD_DLL))
 /* Need to include DllMain() on Windows CE and Watcom C for some reason.. */
@@ -343,4 +344,4 @@
 }
 #endif /* _WIN32_WCE and building DLL with Watcom C */
 
-#endif /* OS/2 elif _WIN32 */
+#endif /* OS/2 elif __WIN32__ */

--- a/src/SDL_error.c	Tue Feb 21 08:34:45 2006 +0000
+++ b/src/SDL_error.c	Tue Feb 21 08:46:50 2006 +0000
@@ -19,6 +19,7 @@
     Sam Lantinga
     slouken@libsdl.org
 */
+#include "SDL_config.h"
 
 /* Simple error handling in SDL */
 

--- a/src/SDL_error_c.h	Tue Feb 21 08:34:45 2006 +0000
+++ b/src/SDL_error_c.h	Tue Feb 21 08:46:50 2006 +0000
@@ -19,6 +19,7 @@
     Sam Lantinga
     slouken@libsdl.org
 */
+#include "SDL_config.h"
 
 /* This file defines a structure that carries language-independent
    error messages

--- a/src/SDL_fatal.c	Tue Feb 21 08:34:45 2006 +0000
+++ b/src/SDL_fatal.c	Tue Feb 21 08:46:50 2006 +0000
@@ -19,11 +19,10 @@
     Sam Lantinga
     slouken@libsdl.org
 */
+#include "SDL_config.h"
 
 /* General fatal signal handling code for SDL */
 
-#include "SDL_config.h"
-
 #ifdef HAVE_SIGNAL_H
 
 #include <signal.h>

--- a/src/SDL_fatal.h	Tue Feb 21 08:34:45 2006 +0000
+++ b/src/SDL_fatal.h	Tue Feb 21 08:46:50 2006 +0000
@@ -19,6 +19,7 @@
     Sam Lantinga
     slouken@libsdl.org
 */
+#include "SDL_config.h"
 
 /* General fatal signal handling code for SDL */
 

--- a/src/audio/SDL_audio.c	Tue Feb 21 08:34:45 2006 +0000
+++ b/src/audio/SDL_audio.c	Tue Feb 21 08:46:50 2006 +0000
@@ -19,6 +19,7 @@
     Sam Lantinga
     slouken@libsdl.org
 */
+#include "SDL_config.h"
 
 /* Allow access to a raw mixing buffer */
 
@@ -97,9 +98,6 @@
 #if SDL_AUDIO_DRIVER_DC
 	&DCAUD_bootstrap,
 #endif
-#if SDL_AUDIO_DRIVER_DRENDERER
-	&DRENDERER_bootstrap,
-#endif
 #if SDL_AUDIO_DRIVER_MMEAUDIO
 	&MMEAUDIO_bootstrap,
 #endif
@@ -114,7 +112,7 @@
 int SDL_AudioInit(const char *driver_name);
 void SDL_AudioQuit(void);
 
-#ifdef ENABLE_AHI
+#if SDL_AUDIO_DRIVER_AHI
 static int audio_configured = 0;
 #endif
 
@@ -127,7 +125,7 @@
 	void  *udata;
 	void (*fill)(void *userdata,Uint8 *stream, int len);
 	int    silence;
-#ifdef ENABLE_AHI
+#if SDL_AUDIO_DRIVER_AHI
 	int started = 0;
 
 /* AmigaOS NEEDS that the audio driver is opened in the thread that uses it! */
@@ -153,7 +151,7 @@
 	fill  = audio->spec.callback;
 	udata = audio->spec.userdata;
 
-#ifdef ENABLE_AHI
+#if SDL_AUDIO_DRIVER_AHI
 	audio_configured = 1;
 
 	D(bug("Audio configured... Checking for conversion\n"));
@@ -174,7 +172,7 @@
 	}
 	stream = audio->fake_stream;
 
-#ifdef ENABLE_AHI
+#if SDL_AUDIO_DRIVER_AHI
 	SDL_mutexV(audio->mixer_lock);
 	D(bug("Entering audio loop...\n"));
 #endif
@@ -197,7 +195,7 @@
 		if ( stream == audio->fake_stream ) {
 			SDL_Delay((audio->spec.samples*1000)/audio->spec.freq);
 		} else {
-#ifdef ENABLE_AHI
+#if SDL_AUDIO_DRIVER_AHI
 			if ( started > 1 )
 #endif
 			audio->WaitAudio(audio);
@@ -238,7 +236,7 @@
 		/* Ready current buffer for play and change current buffer */
 		if ( stream != audio->fake_stream ) {
 			audio->PlayAudio(audio);
-#ifdef ENABLE_AHI
+#if SDL_AUDIO_DRIVER_AHI
 /* AmigaOS don't have to wait the first time audio is played! */
 			started++;
 #endif
@@ -249,7 +247,7 @@
 		audio->WaitDone(audio);
 	}
 
-#ifdef ENABLE_AHI
+#if SDL_AUDIO_DRIVER_AHI
 	D(bug("WaitAudio...Done\n"));
 
 	audio->CloseAudio(audio);
@@ -413,7 +411,7 @@
 		return(-1);
 	}
 
-#if defined(macintosh) || (defined(__riscos__) && SDL_THREADS_DISABLED)
+#if defined(__MACOS__) || (defined(__RISCOS__) && SDL_THREADS_DISABLED)
 	/* FIXME: Need to implement PPC interrupt asm for SDL_LockAudio() */
 #else
 #if defined(__MINT__) && SDL_THREADS_DISABLED
@@ -427,7 +425,7 @@
 		return(-1);
 	}
 #endif /* __MINT__ */
-#endif /* macintosh */
+#endif /* __MACOS__ */
 
 	/* Calculate the silence and size of the audio specification */
 	SDL_CalculateAudioSpec(desired);
@@ -438,7 +436,7 @@
 	audio->enabled = 1;
 	audio->paused  = 1;
 
-#ifndef ENABLE_AHI
+#if SDL_AUDIO_DRIVER_AHI
 
 /* AmigaOS opens audio inside the main loop */
 	audio->opened = audio->OpenAudio(audio, &audio->spec)+1;
@@ -450,8 +448,9 @@
 #else
 	D(bug("Locking semaphore..."));
 	SDL_mutexP(audio->mixer_lock);
+#endif
 
-#if (defined(_WIN32) && !defined(_WIN32_WCE)) && !defined(HAVE_LIBC)
+#if (defined(__WIN32__) && !defined(_WIN32_WCE)) && !defined(HAVE_LIBC)
 #undef SDL_CreateThread
 	audio->thread = SDL_CreateThread(SDL_RunAudio, audio, NULL, NULL);
 #else
@@ -466,6 +465,7 @@
 		return(-1);
 	}
 
+#if SDL_AUDIO_DRIVER_AHI
 	while(!audio_configured)
 		SDL_Delay(100);
 #endif
@@ -511,12 +511,12 @@
 		}
 	}
 
-#ifndef ENABLE_AHI
+#if SDL_AUDIO_DRIVER_AHI
 	/* Start the audio thread if necessary */
 	switch (audio->opened) {
 		case  1:
 			/* Start the audio thread */
-#if (defined(_WIN32) && !defined(_WIN32_WCE)) && !defined(HAVE_LIBC)
+#if (defined(__WIN32__) && !defined(_WIN32_WCE)) && !defined(HAVE_LIBC)
 #undef SDL_CreateThread
 			audio->thread = SDL_CreateThread(SDL_RunAudio, audio, NULL, NULL);
 #else
@@ -611,7 +611,7 @@
 			SDL_FreeAudioMem(audio->convert.buf);
 
 		}
-#ifndef ENABLE_AHI
+#if SDL_AUDIO_DRIVER_AHI
 		if ( audio->opened ) {
 			audio->CloseAudio(audio);
 			audio->opened = 0;

--- a/src/audio/SDL_audio_c.h	Tue Feb 21 08:34:45 2006 +0000
+++ b/src/audio/SDL_audio_c.h	Tue Feb 21 08:46:50 2006 +0000
@@ -19,6 +19,7 @@
     Sam Lantinga
     slouken@libsdl.org
 */
+#include "SDL_config.h"
 
 /* Functions and variables exported from SDL_audio.c for SDL_sysaudio.c */
 

--- a/src/audio/SDL_audiocvt.c	Tue Feb 21 08:34:45 2006 +0000
+++ b/src/audio/SDL_audiocvt.c	Tue Feb 21 08:46:50 2006 +0000
@@ -19,6 +19,7 @@
     Sam Lantinga
     slouken@libsdl.org
 */
+#include "SDL_config.h"
 
 /* Functions for audio drivers to perform runtime conversion of audio format */
 

--- a/src/audio/SDL_audiodev.c	Tue Feb 21 08:34:45 2006 +0000
+++ b/src/audio/SDL_audiodev.c	Tue Feb 21 08:46:50 2006 +0000
@@ -19,10 +19,11 @@
     Sam Lantinga
     slouken@libsdl.org
 */
+#include "SDL_config.h"
 
 /* Get the name of the audio device we use for output */
 
-#if defined(unix) || defined(__unix__) || defined(__riscos__)
+#if SDL_AUDIO_DRIVER_OPENBSD || SDL_AUDIO_DRIVER_OSS || SDL_AUDIO_DRIVER_SUNAUDIO
 
 #include <fcntl.h>
 #include <sys/types.h>
@@ -32,7 +33,7 @@
 #include "SDL_audiodev_c.h"
 
 #ifndef _PATH_DEV_DSP
-#if defined(__NetBSD__) || defined(__OpenBSD__)
+#if defined(__NETBSD__) || defined(__OPENBSD__)
 #define _PATH_DEV_DSP  "/dev/audio"
 #else
 #define _PATH_DEV_DSP  "/dev/dsp"
@@ -95,7 +96,7 @@
 	return(audio_fd);
 }
 
-#elif defined(_AIX)
+#elif SDL_AUDIO_DRIVER_PAUD
 
 /* Get the name of the audio device we use for output */
 
@@ -175,4 +176,4 @@
     return -1;
 }
 
-#endif /* UNIX system */
+#endif /* Audio driver selection */

--- a/src/audio/SDL_audiodev_c.h	Tue Feb 21 08:34:45 2006 +0000
+++ b/src/audio/SDL_audiodev_c.h	Tue Feb 21 08:46:50 2006 +0000
@@ -19,6 +19,7 @@
     Sam Lantinga
     slouken@libsdl.org
 */
+#include "SDL_config.h"
 
 /* Open the audio device, storing the pathname in 'path'  */
 extern int SDL_OpenAudioPath(char *path, int maxlen, int flags, int classic);

--- a/src/audio/SDL_audiomem.h	Tue Feb 21 08:34:45 2006 +0000
+++ b/src/audio/SDL_audiomem.h	Tue Feb 21 08:46:50 2006 +0000
@@ -19,6 +19,7 @@
     Sam Lantinga
     slouken@libsdl.org
 */
+#include "SDL_config.h"
 
 #define SDL_AllocAudioMem	SDL_malloc
 #define SDL_FreeAudioMem	SDL_free

--- a/src/audio/SDL_mixer.c	Tue Feb 21 08:34:45 2006 +0000
+++ b/src/audio/SDL_mixer.c	Tue Feb 21 08:46:50 2006 +0000
@@ -19,6 +19,7 @@
     Sam Lantinga
     slouken@libsdl.org
 */
+#include "SDL_config.h"
 
 /* This provides the default mixing callback for the SDL audio routines */
 
@@ -110,7 +111,7 @@
 	switch (format) {
 
 		case AUDIO_U8: {
-#if defined(__M68000__) && defined(__GNUC__)
+#if defined(__GNUC__) && defined(__M68000__) && defined(SDL_ASSEMBLY_ROUTINES)
 			SDL_MixAudio_m68k_U8((char*)dst,(char*)src,(unsigned long)len,(long)volume,(char *)mix8);
 #else
 			Uint8 src_sample;
@@ -127,21 +128,21 @@
 		break;
 
 		case AUDIO_S8: {
-#if defined(i386) && defined(__GNUC__) && defined(USE_ASMBLIT)
+#if defined(__GNUC__) && defined(__i386__) && defined(SDL_ASSEMBLY_ROUTINES)
 			if (SDL_HasMMX())
 			{
 				SDL_MixAudio_MMX_S8((char*)dst,(char*)src,(unsigned int)len,(int)volume);
 			}
 			else
 #endif
-#if defined(USE_ASM_MIXER_VC)
+#if defined(_MSC_VER) && defined(M_I86) && defined(SDL_ASSEMBLY_ROUTINES)
 			if (SDL_HasMMX())
 			{
 				SDL_MixAudio_MMX_S8_VC((char*)dst,(char*)src,(unsigned int)len,(int)volume);
 			}
 			else
 #endif
-#if defined(__M68000__) && defined(__GNUC__)
+#if defined(__GNUC__) && defined(__M68000__) && defined(SDL_ASSEMBLY_ROUTINES)
 			SDL_MixAudio_m68k_S8((char*)dst,(char*)src,(unsigned long)len,(long)volume);
 #else
 			{
@@ -174,7 +175,7 @@
 		break;
 
 		case AUDIO_S16LSB: {
-#if defined(i386) && defined(__GNUC__) && defined(USE_ASMBLIT)
+#if defined(__GNUC__) && defined(__i386__) && defined(SDL_ASSEMBLY_ROUTINES)
 			if (SDL_HasMMX())
 			{
 				SDL_MixAudio_MMX_S16((char*)dst,(char*)src,(unsigned int)len,(int)volume);
@@ -187,7 +188,7 @@
 			}
 			else
 #endif
-#if defined(__M68000__) && defined(__GNUC__)
+#if defined(__GNUC__) && defined(__M68000__) && defined(SDL_ASSEMBLY_ROUTINES)
 			SDL_MixAudio_m68k_S16LSB((short*)dst,(short*)src,(unsigned long)len,(long)volume);
 #else
 			{
@@ -220,7 +221,7 @@
 		break;
 
 		case AUDIO_S16MSB: {
-#if defined(__M68000__) && defined(__GNUC__)
+#if defined(__GNUC__) && defined(__M68000__) && defined(SDL_ASSEMBLY_ROUTINES)
 			SDL_MixAudio_m68k_S16MSB((short*)dst,(short*)src,(unsigned long)len,(long)volume);
 #else
 			Sint16 src1, src2;

--- a/src/audio/SDL_mixer_MMX.c	Tue Feb 21 08:34:45 2006 +0000
+++ b/src/audio/SDL_mixer_MMX.c	Tue Feb 21 08:46:50 2006 +0000
@@ -1,3 +1,26 @@
+/*
+    SDL - Simple DirectMedia Layer
+    Copyright (C) 1997-2006 Sam Lantinga
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+    Sam Lantinga
+    slouken@libsdl.org
+*/
+#include "SDL_config.h"
+
 /*
     MMX assembler version of SDL_MixAudio for signed little endian 16 bit samples and signed 8 bit samples
     Copyright 2002 Stephane Marchesin (stephane.marchesin@wanadoo.fr)
@@ -12,7 +35,7 @@
 *   Mixing for 16 bit signed buffers
 ***********************************************/
 
-#if defined(i386) && defined(__GNUC__) && defined(USE_ASMBLIT)
+#if defined(__GNUC__) && defined(__i386__) && defined(SDL_ASSEMBLY_ROUTINES)
 void SDL_MixAudio_MMX_S16(char* dst,char* src,unsigned int size,int volume)
 {
     __asm__ __volatile__ (

--- a/src/audio/SDL_mixer_MMX.h	Tue Feb 21 08:34:45 2006 +0000
+++ b/src/audio/SDL_mixer_MMX.h	Tue Feb 21 08:46:50 2006 +0000
@@ -6,6 +6,7 @@
     Assumes buffer size in bytes is a multiple of 16
     Assumes SDL_MIX_MAXVOLUME = 128
 */
+#include "SDL_config.h"
 
 
 #if defined(i386) && defined(__GNUC__) && defined(USE_ASMBLIT)

--- a/src/audio/SDL_mixer_MMX_VC.c	Tue Feb 21 08:34:45 2006 +0000
+++ b/src/audio/SDL_mixer_MMX_VC.c	Tue Feb 21 08:46:50 2006 +0000
@@ -1,7 +1,29 @@
+/*
+    SDL - Simple DirectMedia Layer
+    Copyright (C) 1997-2006 Sam Lantinga
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+    Sam Lantinga
+    slouken@libsdl.org
+*/
+#include "SDL_config.h"
 
 #include "SDL_mixer_MMX_VC.h"
 
-#if defined(USE_ASM_MIXER_VC)
+#if defined(_MSC_VER) && defined(M_I86) && defined(SDL_ASSEMBLY_ROUTINES)
 // MMX assembler version of SDL_MixAudio for signed little endian 16 bit samples and signed 8 bit samples
 // Copyright 2002 Stephane Marchesin (stephane.marchesin@wanadoo.fr)
 // Converted to Intel ASM notation by Cth
@@ -156,4 +178,4 @@
 	}
 }
 
-#endif /* USE_ASM_MIXER_VC */
+#endif /* SDL_ASSEMBLY_ROUTINES */

--- a/src/audio/SDL_mixer_MMX_VC.h	Tue Feb 21 08:34:45 2006 +0000
+++ b/src/audio/SDL_mixer_MMX_VC.h	Tue Feb 21 08:46:50 2006 +0000
@@ -1,7 +1,27 @@
-#ifdef _MSC_VER
-#define USE_ASM_MIXER_VC
-#endif
-#if defined(USE_ASM_MIXER_VC)
+/*
+    SDL - Simple DirectMedia Layer
+    Copyright (C) 1997-2006 Sam Lantinga
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+    Sam Lantinga
+    slouken@libsdl.org
+*/
+#include "SDL_config.h"
+
+#if defined(_MSC_VER) && defined(M_I86) && defined(SDL_ASSEMBLY_ROUTINES)
 // headers for MMX assembler version of SDL_MixAudio
 // Copyright 2002 Stephane Marchesin (stephane.marchesin@wanadoo.fr)
 // Converted to Intel ASM notation by Cth

--- a/src/audio/SDL_mixer_m68k.c	Tue Feb 21 08:34:45 2006 +0000
+++ b/src/audio/SDL_mixer_m68k.c	Tue Feb 21 08:46:50 2006 +0000
@@ -19,6 +19,7 @@
     Sam Lantinga
     slouken@libsdl.org
 */
+#include "SDL_config.h"
 
 /*
 	m68k assembly mix routines

--- a/src/audio/SDL_mixer_m68k.h	Tue Feb 21 08:34:45 2006 +0000
+++ b/src/audio/SDL_mixer_m68k.h	Tue Feb 21 08:46:50 2006 +0000
@@ -19,6 +19,7 @@
     Sam Lantinga
     slouken@libsdl.org
 */
+#include "SDL_config.h"
 
 /*
 	m68k assembly mix routines

--- a/src/audio/SDL_sysaudio.h	Tue Feb 21 08:34:45 2006 +0000
+++ b/src/audio/SDL_sysaudio.h	Tue Feb 21 08:46:50 2006 +0000
@@ -19,6 +19,7 @@
     Sam Lantinga
     slouken@libsdl.org
 */
+#include "SDL_config.h"
 
 #ifndef _SDL_sysaudio_h
 #define _SDL_sysaudio_h
@@ -161,9 +162,6 @@
 #if SDL_AUDIO_DRIVER_DC
 extern AudioBootStrap DCAUD_bootstrap;
 #endif
-#if SDL_AUDIO_DRIVER_DRENDERER
-extern AudioBootStrap DRENDERER_bootstrap;
-#endif
 #if SDL_AUDIO_DRIVER_MMEAUDIO
 extern AudioBootStrap MMEAUDIO_bootstrap;
 #endif

--- a/src/audio/SDL_wave.c	Tue Feb 21 08:34:45 2006 +0000
+++ b/src/audio/SDL_wave.c	Tue Feb 21 08:46:50 2006 +0000
@@ -19,6 +19,7 @@
     Sam Lantinga
     slouken@libsdl.org
 */
+#include "SDL_config.h"
 
 /* Microsoft WAVE file loading routines */
 

--- a/src/audio/SDL_wave.h	Tue Feb 21 08:34:45 2006 +0000
+++ b/src/audio/SDL_wave.h	Tue Feb 21 08:46:50 2006 +0000
@@ -19,6 +19,7 @@
     Sam Lantinga
     slouken@libsdl.org
 */
+#include "SDL_config.h"
 
 /* WAVE files are little-endian */
 

--- a/src/audio/alsa/SDL_alsa_audio.c	Tue Feb 21 08:34:45 2006 +0000
+++ b/src/audio/alsa/SDL_alsa_audio.c	Tue Feb 21 08:46:50 2006 +0000
@@ -19,8 +19,7 @@
     Sam Lantinga
     slouken@libsdl.org
 */
-
-
+#include "SDL_config.h"
 
 /* Allow access to a raw mixing buffer */
 

--- a/src/audio/alsa/SDL_alsa_audio.h	Tue Feb 21 08:34:45 2006 +0000
+++ b/src/audio/alsa/SDL_alsa_audio.h	Tue Feb 21 08:46:50 2006 +0000
@@ -19,6 +19,7 @@
     Sam Lantinga
     slouken@libsdl.org
 */
+#include "SDL_config.h"
 
 #ifndef _ALSA_PCM_audio_h
 #define _ALSA_PCM_audio_h

--- a/src/audio/amigaos/SDL_ahiaudio.c	Tue Feb 21 08:34:45 2006 +0000
+++ b/src/audio/amigaos/SDL_ahiaudio.c	Tue Feb 21 08:46:50 2006 +0000
@@ -19,6 +19,7 @@
     Sam Lantinga
     slouken@libsdl.org
 */
+#include "SDL_config.h"
 
 /* Allow access to a raw mixing buffer (for AmigaOS) */
 

--- a/src/audio/amigaos/SDL_ahiaudio.h	Tue Feb 21 08:34:45 2006 +0000
+++ b/src/audio/amigaos/SDL_ahiaudio.h	Tue Feb 21 08:46:50 2006 +0000
@@ -19,6 +19,7 @@
     Sam Lantinga
     slouken@libsdl.org
 */
+#include "SDL_config.h"
 
 #ifndef _SDL_ahiaudio_h
 #define _SDL_ahiaudio_h

--- a/src/audio/arts/SDL_artsaudio.c	Tue Feb 21 08:34:45 2006 +0000
+++ b/src/audio/arts/SDL_artsaudio.c	Tue Feb 21 08:46:50 2006 +0000
@@ -19,6 +19,7 @@
     Sam Lantinga
     slouken@libsdl.org
 */
+#include "SDL_config.h"
 
 /* Allow access to a raw mixing buffer */
 

--- a/src/audio/arts/SDL_artsaudio.h	Tue Feb 21 08:34:45 2006 +0000
+++ b/src/audio/arts/SDL_artsaudio.h	Tue Feb 21 08:46:50 2006 +0000
@@ -19,6 +19,7 @@
     Sam Lantinga
     slouken@libsdl.org
 */
+#include "SDL_config.h"
 
 #ifndef _SDL_artscaudio_h
 #define _SDL_artscaudio_h

--- a/src/audio/baudio/SDL_beaudio.h	Tue Feb 21 08:34:45 2006 +0000
+++ b/src/audio/baudio/SDL_beaudio.h	Tue Feb 21 08:46:50 2006 +0000
@@ -19,6 +19,7 @@
     Sam Lantinga
     slouken@libsdl.org
 */
+#include "SDL_config.h"
 
 #ifndef _SDL_lowaudio_h
 #define _SDL_lowaudio_h

--- a/src/audio/dart/SDL_dart.c	Tue Feb 21 08:34:45 2006 +0000
+++ b/src/audio/dart/SDL_dart.c	Tue Feb 21 08:46:50 2006 +0000
@@ -19,6 +19,7 @@
     Sam Lantinga
     slouken@libsdl.org
 */
+#include "SDL_config.h"
 
 /* Allow access to a raw mixing buffer */
 

--- a/src/audio/dart/SDL_dart.h	Tue Feb 21 08:34:45 2006 +0000
+++ b/src/audio/dart/SDL_dart.h	Tue Feb 21 08:46:50 2006 +0000
@@ -19,6 +19,7 @@
     Sam Lantinga
     slouken@libsdl.org
 */
+#include "SDL_config.h"
 
 #ifndef _SDL_lowaudio_h
 #define _SDL_lowaudio_h

--- a/src/audio/dc/SDL_dcaudio.c	Tue Feb 21 08:34:45 2006 +0000
+++ b/src/audio/dc/SDL_dcaudio.c	Tue Feb 21 08:46:50 2006 +0000
@@ -20,6 +20,7 @@
     slouken@libsdl.org
 
 */
+#include "SDL_config.h"
 
 /* Output dreamcast aica */
 

--- a/src/audio/dc/SDL_dcaudio.h	Tue Feb 21 08:34:45 2006 +0000
+++ b/src/audio/dc/SDL_dcaudio.h	Tue Feb 21 08:46:50 2006 +0000
@@ -19,6 +19,7 @@
     Sam Lantinga
     slouken@libsdl.org
 */
+#include "SDL_config.h"
 
 #ifndef _SDL_diskaudio_h
 #define _SDL_diskaudio_h

--- a/src/audio/dc/aica.h	Tue Feb 21 08:34:45 2006 +0000
+++ b/src/audio/dc/aica.h	Tue Feb 21 08:46:50 2006 +0000
@@ -1,3 +1,26 @@
+/*
+    SDL - Simple DirectMedia Layer
+    Copyright (C) 1997-2006 Sam Lantinga
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+    Sam Lantinga
+    slouken@libsdl.org
+*/
+#include "SDL_config.h"
+
 #ifndef _AICA_H_
 #define _AICA_H_
 

--- a/src/audio/disk/SDL_diskaudio.c	Tue Feb 21 08:34:45 2006 +0000
+++ b/src/audio/disk/SDL_diskaudio.c	Tue Feb 21 08:46:50 2006 +0000
@@ -22,6 +22,7 @@
     This file hacked^H^H^H^H^H^Hwritten by Ryan C. Gordon
         (icculus@linuxgames.com)
 */
+#include "SDL_config.h"
 
 /* Output raw audio data to a file. */
 

--- a/src/audio/disk/SDL_diskaudio.h	Tue Feb 21 08:34:45 2006 +0000
+++ b/src/audio/disk/SDL_diskaudio.h	Tue Feb 21 08:46:50 2006 +0000
@@ -19,6 +19,7 @@
     Sam Lantinga
     slouken@libsdl.org
 */
+#include "SDL_config.h"
 
 #ifndef _SDL_diskaudio_h
 #define _SDL_diskaudio_h

--- a/src/audio/dma/SDL_dmaaudio.c	Tue Feb 21 08:34:45 2006 +0000
+++ b/src/audio/dma/SDL_dmaaudio.c	Tue Feb 21 08:46:50 2006 +0000
@@ -19,6 +19,7 @@
     Sam Lantinga
     slouken@libsdl.org
 */
+#include "SDL_config.h"
 
 /* Allow access to a raw mixing buffer */
 
@@ -34,8 +35,6 @@
 #include <sys/stat.h>
 #include <sys/mman.h>
 
-#include "SDL_config.h"
-
 #if SDL_AUDIO_DRIVER_OSS_SOUNDCARD_H
 /* This is installed on some systems */
 #include <soundcard.h>

--- a/src/audio/dma/SDL_dmaaudio.h	Tue Feb 21 08:34:45 2006 +0000
+++ b/src/audio/dma/SDL_dmaaudio.h	Tue Feb 21 08:46:50 2006 +0000
@@ -19,6 +19,7 @@
     Sam Lantinga
     slouken@libsdl.org
 */
+#include "SDL_config.h"
 
 #ifndef _SDL_dspaudio_h
 #define _SDL_dspaudio_h

--- a/src/audio/dmedia/SDL_irixaudio.c	Tue Feb 21 08:34:45 2006 +0000
+++ b/src/audio/dmedia/SDL_irixaudio.c	Tue Feb 21 08:46:50 2006 +0000
@@ -19,6 +19,7 @@
     Sam Lantinga
     slouken@libsdl.org
 */
+#include "SDL_config.h"
 
 /* Allow access to a raw mixing buffer (For IRIX 6.5 and higher) */
 /* patch for IRIX 5 by Georg Schwarz 18/07/2004 */

--- a/src/audio/dmedia/SDL_irixaudio.h	Tue Feb 21 08:34:45 2006 +0000
+++ b/src/audio/dmedia/SDL_irixaudio.h	Tue Feb 21 08:46:50 2006 +0000
@@ -19,6 +19,7 @@
     Sam Lantinga
     slouken@libsdl.org
 */
+#include "SDL_config.h"
 
 #ifndef _SDL_lowaudio_h
 #define _SDL_lowaudio_h

--- a/src/audio/dsp/SDL_dspaudio.c	Tue Feb 21 08:34:45 2006 +0000
+++ b/src/audio/dsp/SDL_dspaudio.c	Tue Feb 21 08:46:50 2006 +0000
@@ -22,6 +22,7 @@
     Modified in Oct 2004 by Hannu Savolainen 
     hannu@opensound.com
 */
+#include "SDL_config.h"
 
 /* Allow access to a raw mixing buffer */
 
@@ -35,8 +36,6 @@
 #include <sys/ioctl.h>
 #include <sys/stat.h>
 
-#include "SDL_config.h"
-
 #if SDL_AUDIO_DRIVER_OSS_SOUNDCARD_H
 /* This is installed on some systems */
 #include <soundcard.h>

--- a/src/audio/dsp/SDL_dspaudio.h	Tue Feb 21 08:34:45 2006 +0000
+++ b/src/audio/dsp/SDL_dspaudio.h	Tue Feb 21 08:46:50 2006 +0000
@@ -19,6 +19,7 @@
     Sam Lantinga
     slouken@libsdl.org
 */
+#include "SDL_config.h"
 
 #ifndef _SDL_dspaudio_h
 #define _SDL_dspaudio_h

--- a/src/audio/esd/SDL_esdaudio.c	Tue Feb 21 08:34:45 2006 +0000
+++ b/src/audio/esd/SDL_esdaudio.c	Tue Feb 21 08:46:50 2006 +0000
@@ -19,6 +19,7 @@
     Sam Lantinga
     slouken@libsdl.org
 */
+#include "SDL_config.h"
 
 /* Allow access to an ESD network stream mixing buffer */
 
@@ -244,7 +245,7 @@
 static char *get_progname(void)
 {
 	char *progname = NULL;
-#ifdef linux
+#ifdef __LINUX__
 	FILE *fp;
 	static char temp[BUFSIZ];
 

--- a/src/audio/esd/SDL_esdaudio.h	Tue Feb 21 08:34:45 2006 +0000
+++ b/src/audio/esd/SDL_esdaudio.h	Tue Feb 21 08:46:50 2006 +0000
@@ -19,6 +19,7 @@
     Sam Lantinga
     slouken@libsdl.org
 */
+#include "SDL_config.h"
 
 #ifndef _SDL_esdaudio_h
 #define _SDL_esdaudio_h

--- a/src/audio/macosx/SDL_coreaudio.c	Tue Feb 21 08:34:45 2006 +0000
+++ b/src/audio/macosx/SDL_coreaudio.c	Tue Feb 21 08:46:50 2006 +0000
@@ -19,6 +19,7 @@
     Sam Lantinga
     slouken@libsdl.org
 */
+#include "SDL_config.h"
 
 #include <AudioUnit/AudioUnit.h>
 

--- a/src/audio/macosx/SDL_coreaudio.h	Tue Feb 21 08:34:45 2006 +0000
+++ b/src/audio/macosx/SDL_coreaudio.h	Tue Feb 21 08:46:50 2006 +0000
@@ -19,6 +19,7 @@
     Sam Lantinga
     slouken@libsdl.org
 */
+#include "SDL_config.h"
 
 #ifndef _SDL_coreaudio_h
 #define _SDL_coreaudio_h

--- a/src/audio/macrom/SDL_romaudio.c	Tue Feb 21 08:34:45 2006 +0000
+++ b/src/audio/macrom/SDL_romaudio.c	Tue Feb 21 08:46:50 2006 +0000
@@ -19,6 +19,7 @@
     Sam Lantinga
     slouken@libsdl.org
 */
+#include "SDL_config.h"
 
 #if defined(__APPLE__) && defined(__MACH__)
 #  include <Carbon/Carbon.h>
@@ -92,7 +93,7 @@
     this->UnlockAudio = Mac_UnlockAudio;
     this->free        = Audio_DeleteDevice;
 
-#ifdef MACOSX	/* MacOS X uses threaded audio, so normal thread code is okay */
+#ifdef __MACOSX__	/* MacOS X uses threaded audio, so normal thread code is okay */
     this->LockAudio   = NULL;
     this->UnlockAudio = NULL;
 #endif
@@ -120,7 +121,7 @@
 static void mix_buffer(SDL_AudioDevice *audio, UInt8 *buffer)
 {
    if ( ! audio->paused ) {
-#ifdef MACOSX
+#ifdef __MACOSX__
         SDL_mutexP(audio->mixer_lock);
 #endif
         if ( audio->convert.needed ) {
@@ -134,7 +135,7 @@
         } else {
             audio->spec.callback(audio->spec.userdata, buffer, audio->spec.size);
         }
-#ifdef MACOSX
+#ifdef __MACOSX__
         SDL_mutexV(audio->mixer_lock);
 #endif
     }

--- a/src/audio/macrom/SDL_romaudio.h	Tue Feb 21 08:34:45 2006 +0000
+++ b/src/audio/macrom/SDL_romaudio.h	Tue Feb 21 08:46:50 2006 +0000
@@ -19,6 +19,7 @@
     Sam Lantinga
     slouken@libsdl.org
 */
+#include "SDL_config.h"
 
 #ifndef _SDL_romaudio_h
 #define _SDL_romaudio_h

--- a/src/audio/mint/SDL_mintaudio.c	Tue Feb 21 08:34:45 2006 +0000
+++ b/src/audio/mint/SDL_mintaudio.c	Tue Feb 21 08:46:50 2006 +0000
@@ -19,6 +19,7 @@
     Sam Lantinga
     slouken@libsdl.org
 */
+#include "SDL_config.h"
 
 /*
 	Audio interrupt variables and callback function

--- a/src/audio/mint/SDL_mintaudio.h	Tue Feb 21 08:34:45 2006 +0000
+++ b/src/audio/mint/SDL_mintaudio.h	Tue Feb 21 08:46:50 2006 +0000
@@ -19,6 +19,7 @@
     Sam Lantinga
     slouken@libsdl.org
 */
+#include "SDL_config.h"
 
 /*
 	MiNT audio driver

--- a/src/audio/mint/SDL_mintaudio_dma8.c	Tue Feb 21 08:34:45 2006 +0000
+++ b/src/audio/mint/SDL_mintaudio_dma8.c	Tue Feb 21 08:46:50 2006 +0000
@@ -19,6 +19,7 @@
     Sam Lantinga
     slouken@libsdl.org
 */
+#include "SDL_config.h"
 
 /*
 	MiNT audio driver

--- a/src/audio/mint/SDL_mintaudio_dma8.h	Tue Feb 21 08:34:45 2006 +0000
+++ b/src/audio/mint/SDL_mintaudio_dma8.h	Tue Feb 21 08:46:50 2006 +0000
@@ -19,6 +19,7 @@
     Sam Lantinga
     slouken@libsdl.org
 */
+#include "SDL_config.h"
 
 /*
 	DMA 8bits and Falcon Codec audio definitions

--- a/src/audio/mint/SDL_mintaudio_gsxb.c	Tue Feb 21 08:34:45 2006 +0000
+++ b/src/audio/mint/SDL_mintaudio_gsxb.c	Tue Feb 21 08:46:50 2006 +0000
@@ -19,6 +19,7 @@
     Sam Lantinga
     slouken@libsdl.org
 */
+#include "SDL_config.h"
 
 /*
 	MiNT audio driver

--- a/src/audio/mint/SDL_mintaudio_gsxb.h	Tue Feb 21 08:34:45 2006 +0000
+++ b/src/audio/mint/SDL_mintaudio_gsxb.h	Tue Feb 21 08:46:50 2006 +0000
@@ -1,3 +1,26 @@
+/*
+    SDL - Simple DirectMedia Layer
+    Copyright (C) 1997-2006 Sam Lantinga
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+    Sam Lantinga
+    slouken@libsdl.org
+*/
+#include "SDL_config.h"
+
 /*
  * GSXB audio definitions
  *