From 58b6bff66e23be9b5ef6301deacdf8c3190c94be Mon Sep 17 00:00:00 2001 From: "Ryan C. Gordon" Date: Thu, 3 Nov 2011 11:51:47 -0400 Subject: [PATCH] Fixed some preprocessor mistakes introduced in iOS project cleanup. --- src/audio/alsa/SDL_alsa_audio.c | 6 +++--- src/audio/arts/SDL_artsaudio.c | 4 ++-- src/audio/esd/SDL_esdaudio.c | 4 ++-- src/audio/fusionsound/SDL_fsaudio.c | 4 ++-- src/audio/nas/SDL_nasaudio.c | 4 ++-- src/audio/pulseaudio/SDL_pulseaudio.c | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/audio/alsa/SDL_alsa_audio.c b/src/audio/alsa/SDL_alsa_audio.c index eb754ec44..f3e4b0a23 100644 --- a/src/audio/alsa/SDL_alsa_audio.c +++ b/src/audio/alsa/SDL_alsa_audio.c @@ -35,7 +35,7 @@ #include "../SDL_audio_c.h" #include "SDL_alsa_audio.h" -#if SDL_AUDIO_DRIVER_ALSA_DYNAMIC +#ifdef SDL_AUDIO_DRIVER_ALSA_DYNAMIC #include "SDL_loadso.h" #endif @@ -86,7 +86,7 @@ static int (*ALSA_snd_pcm_wait)(snd_pcm_t *, int); static int (*ALSA_snd_pcm_sw_params_set_avail_min) (snd_pcm_t *, snd_pcm_sw_params_t *, snd_pcm_uframes_t); -#if SDL_AUDIO_DRIVER_ALSA_DYNAMIC +#ifdef SDL_AUDIO_DRIVER_ALSA_DYNAMIC #define snd_pcm_hw_params_sizeof ALSA_snd_pcm_hw_params_sizeof #define snd_pcm_sw_params_sizeof ALSA_snd_pcm_sw_params_sizeof @@ -149,7 +149,7 @@ load_alsa_syms(void) #undef SDL_ALSA_SYM -#if SDL_AUDIO_DRIVER_ALSA_DYNAMIC +#ifdef SDL_AUDIO_DRIVER_ALSA_DYNAMIC static void UnloadALSALibrary(void) diff --git a/src/audio/arts/SDL_artsaudio.c b/src/audio/arts/SDL_artsaudio.c index 25d7bd40f..57c29c56b 100644 --- a/src/audio/arts/SDL_artsaudio.c +++ b/src/audio/arts/SDL_artsaudio.c @@ -36,14 +36,14 @@ #include "../SDL_audio_c.h" #include "SDL_artsaudio.h" -#if SDL_AUDIO_DRIVER_ARTS_DYNAMIC +#ifdef SDL_AUDIO_DRIVER_ARTS_DYNAMIC #include "SDL_name.h" #include "SDL_loadso.h" #else #define SDL_NAME(X) X #endif -#if SDL_AUDIO_DRIVER_ARTS_DYNAMIC +#ifdef SDL_AUDIO_DRIVER_ARTS_DYNAMIC static const char *arts_library = SDL_AUDIO_DRIVER_ARTS_DYNAMIC; static void *arts_handle = NULL; diff --git a/src/audio/esd/SDL_esdaudio.c b/src/audio/esd/SDL_esdaudio.c index e824e9564..03ae3278a 100644 --- a/src/audio/esd/SDL_esdaudio.c +++ b/src/audio/esd/SDL_esdaudio.c @@ -36,14 +36,14 @@ #include "../SDL_audio_c.h" #include "SDL_esdaudio.h" -#if SDL_AUDIO_DRIVER_ESD_DYNAMIC +#ifdef SDL_AUDIO_DRIVER_ESD_DYNAMIC #include "SDL_name.h" #include "SDL_loadso.h" #else #define SDL_NAME(X) X #endif -#if SDL_AUDIO_DRIVER_ESD_DYNAMIC +#ifdef SDL_AUDIO_DRIVER_ESD_DYNAMIC static const char *esd_library = SDL_AUDIO_DRIVER_ESD_DYNAMIC; static void *esd_handle = NULL; diff --git a/src/audio/fusionsound/SDL_fsaudio.c b/src/audio/fusionsound/SDL_fsaudio.c index 3ba9ba773..05bd1754e 100644 --- a/src/audio/fusionsound/SDL_fsaudio.c +++ b/src/audio/fusionsound/SDL_fsaudio.c @@ -39,7 +39,7 @@ //#define SDL_AUDIO_DRIVER_FUSIONSOUND_DYNAMIC "libfusionsound.so" -#if SDL_AUDIO_DRIVER_FUSIONSOUND_DYNAMIC +#ifdef SDL_AUDIO_DRIVER_FUSIONSOUND_DYNAMIC #include "SDL_name.h" #include "SDL_loadso.h" #else @@ -53,7 +53,7 @@ typedef DFBResult DirectResult; /* Buffers to use - more than 2 gives a lot of latency */ #define FUSION_BUFFERS (2) -#if SDL_AUDIO_DRIVER_FUSIONSOUND_DYNAMIC +#ifdef SDL_AUDIO_DRIVER_FUSIONSOUND_DYNAMIC static const char *fs_library = SDL_AUDIO_DRIVER_FUSIONSOUND_DYNAMIC; static void *fs_handle = NULL; diff --git a/src/audio/nas/SDL_nasaudio.c b/src/audio/nas/SDL_nasaudio.c index a31faad39..d44f55627 100644 --- a/src/audio/nas/SDL_nasaudio.c +++ b/src/audio/nas/SDL_nasaudio.c @@ -52,7 +52,7 @@ static AuEventHandlerRec *(*NAS_AuRegisterEventHandler) (AuServer *, AuMask, int, AuID, AuEventHandlerCallback, AuPointer); -#if SDL_AUDIO_DRIVER_NAS_DYNAMIC +#ifdef SDL_AUDIO_DRIVER_NAS_DYNAMIC static const char *nas_library = SDL_AUDIO_DRIVER_NAS_DYNAMIC; static void *nas_handle = NULL; @@ -91,7 +91,7 @@ load_nas_syms(void) #undef SDL_NAS_SYM -#if SDL_AUDIO_DRIVER_NAS_DYNAMIC +#ifdef SDL_AUDIO_DRIVER_NAS_DYNAMIC static void UnloadNASLibrary(void) diff --git a/src/audio/pulseaudio/SDL_pulseaudio.c b/src/audio/pulseaudio/SDL_pulseaudio.c index b3e0b4e58..6b2333e02 100644 --- a/src/audio/pulseaudio/SDL_pulseaudio.c +++ b/src/audio/pulseaudio/SDL_pulseaudio.c @@ -106,7 +106,7 @@ static void (*PULSEAUDIO_pa_stream_unref) (pa_stream *); static int load_pulseaudio_syms(void); -#if SDL_AUDIO_DRIVER_PULSEAUDIO_DYNAMIC +#ifdef SDL_AUDIO_DRIVER_PULSEAUDIO_DYNAMIC static const char *pulseaudio_library = SDL_AUDIO_DRIVER_PULSEAUDIO_DYNAMIC; static void *pulseaudio_handle = NULL;