Commit 4220f125 authored by Ryan C. Gordon's avatar Ryan C. Gordon

Fixed some preprocessor mistakes introduced in iOS project cleanup.

parent 9f84d0e0
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
#include "../SDL_audio_c.h" #include "../SDL_audio_c.h"
#include "SDL_alsa_audio.h" #include "SDL_alsa_audio.h"
#if SDL_AUDIO_DRIVER_ALSA_DYNAMIC #ifdef SDL_AUDIO_DRIVER_ALSA_DYNAMIC
#include "SDL_loadso.h" #include "SDL_loadso.h"
#endif #endif
...@@ -86,7 +86,7 @@ static int (*ALSA_snd_pcm_wait)(snd_pcm_t *, int); ...@@ -86,7 +86,7 @@ static int (*ALSA_snd_pcm_wait)(snd_pcm_t *, int);
static int (*ALSA_snd_pcm_sw_params_set_avail_min) static int (*ALSA_snd_pcm_sw_params_set_avail_min)
(snd_pcm_t *, snd_pcm_sw_params_t *, snd_pcm_uframes_t); (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_hw_params_sizeof ALSA_snd_pcm_hw_params_sizeof
#define snd_pcm_sw_params_sizeof ALSA_snd_pcm_sw_params_sizeof #define snd_pcm_sw_params_sizeof ALSA_snd_pcm_sw_params_sizeof
...@@ -149,7 +149,7 @@ load_alsa_syms(void) ...@@ -149,7 +149,7 @@ load_alsa_syms(void)
#undef SDL_ALSA_SYM #undef SDL_ALSA_SYM
#if SDL_AUDIO_DRIVER_ALSA_DYNAMIC #ifdef SDL_AUDIO_DRIVER_ALSA_DYNAMIC
static void static void
UnloadALSALibrary(void) UnloadALSALibrary(void)
......
...@@ -36,14 +36,14 @@ ...@@ -36,14 +36,14 @@
#include "../SDL_audio_c.h" #include "../SDL_audio_c.h"
#include "SDL_artsaudio.h" #include "SDL_artsaudio.h"
#if SDL_AUDIO_DRIVER_ARTS_DYNAMIC #ifdef SDL_AUDIO_DRIVER_ARTS_DYNAMIC
#include "SDL_name.h" #include "SDL_name.h"
#include "SDL_loadso.h" #include "SDL_loadso.h"
#else #else
#define SDL_NAME(X) X #define SDL_NAME(X) X
#endif #endif
#if SDL_AUDIO_DRIVER_ARTS_DYNAMIC #ifdef SDL_AUDIO_DRIVER_ARTS_DYNAMIC
static const char *arts_library = SDL_AUDIO_DRIVER_ARTS_DYNAMIC; static const char *arts_library = SDL_AUDIO_DRIVER_ARTS_DYNAMIC;
static void *arts_handle = NULL; static void *arts_handle = NULL;
......
...@@ -36,14 +36,14 @@ ...@@ -36,14 +36,14 @@
#include "../SDL_audio_c.h" #include "../SDL_audio_c.h"
#include "SDL_esdaudio.h" #include "SDL_esdaudio.h"
#if SDL_AUDIO_DRIVER_ESD_DYNAMIC #ifdef SDL_AUDIO_DRIVER_ESD_DYNAMIC
#include "SDL_name.h" #include "SDL_name.h"
#include "SDL_loadso.h" #include "SDL_loadso.h"
#else #else
#define SDL_NAME(X) X #define SDL_NAME(X) X
#endif #endif
#if SDL_AUDIO_DRIVER_ESD_DYNAMIC #ifdef SDL_AUDIO_DRIVER_ESD_DYNAMIC
static const char *esd_library = SDL_AUDIO_DRIVER_ESD_DYNAMIC; static const char *esd_library = SDL_AUDIO_DRIVER_ESD_DYNAMIC;
static void *esd_handle = NULL; static void *esd_handle = NULL;
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
//#define SDL_AUDIO_DRIVER_FUSIONSOUND_DYNAMIC "libfusionsound.so" //#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_name.h"
#include "SDL_loadso.h" #include "SDL_loadso.h"
#else #else
...@@ -53,7 +53,7 @@ typedef DFBResult DirectResult; ...@@ -53,7 +53,7 @@ typedef DFBResult DirectResult;
/* Buffers to use - more than 2 gives a lot of latency */ /* Buffers to use - more than 2 gives a lot of latency */
#define FUSION_BUFFERS (2) #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 const char *fs_library = SDL_AUDIO_DRIVER_FUSIONSOUND_DYNAMIC;
static void *fs_handle = NULL; static void *fs_handle = NULL;
......
...@@ -52,7 +52,7 @@ static AuEventHandlerRec *(*NAS_AuRegisterEventHandler) ...@@ -52,7 +52,7 @@ static AuEventHandlerRec *(*NAS_AuRegisterEventHandler)
(AuServer *, AuMask, int, AuID, AuEventHandlerCallback, AuPointer); (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 const char *nas_library = SDL_AUDIO_DRIVER_NAS_DYNAMIC;
static void *nas_handle = NULL; static void *nas_handle = NULL;
...@@ -91,7 +91,7 @@ load_nas_syms(void) ...@@ -91,7 +91,7 @@ load_nas_syms(void)
#undef SDL_NAS_SYM #undef SDL_NAS_SYM
#if SDL_AUDIO_DRIVER_NAS_DYNAMIC #ifdef SDL_AUDIO_DRIVER_NAS_DYNAMIC
static void static void
UnloadNASLibrary(void) UnloadNASLibrary(void)
......
...@@ -106,7 +106,7 @@ static void (*PULSEAUDIO_pa_stream_unref) (pa_stream *); ...@@ -106,7 +106,7 @@ static void (*PULSEAUDIO_pa_stream_unref) (pa_stream *);
static int load_pulseaudio_syms(void); 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 const char *pulseaudio_library = SDL_AUDIO_DRIVER_PULSEAUDIO_DYNAMIC;
static void *pulseaudio_handle = NULL; static void *pulseaudio_handle = NULL;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment