Browse Source

Patched to compile on some compilers.

Ryan C. Gordon 8 years ago
parent
commit
4aa9e36983
2 changed files with 7 additions and 2 deletions
  1. 6 0
      src/audio/SDL_audio_c.h
  2. 1 2
      src/audio/SDL_sysaudio.h

+ 6 - 0
src/audio/SDL_audio_c.h

@@ -18,6 +18,10 @@
      misrepresented as being the original software.
      misrepresented as being the original software.
   3. This notice may not be removed or altered from any source distribution.
   3. This notice may not be removed or altered from any source distribution.
 */
 */
+
+#ifndef SDL_audio_c_h_
+#define SDL_audio_c_h_
+
 #include "../SDL_internal.h"
 #include "../SDL_internal.h"
 
 
 #ifndef DEBUG_CONVERT
 #ifndef DEBUG_CONVERT
@@ -94,4 +98,6 @@ int SDL_AudioStreamAvailable(SDL_AudioStream *stream);
 /* dispose of a stream */
 /* dispose of a stream */
 void SDL_FreeAudioStream(SDL_AudioStream *stream);
 void SDL_FreeAudioStream(SDL_AudioStream *stream);
 
 
+#endif
+
 /* vi: set ts=4 sw=4 expandtab: */
 /* vi: set ts=4 sw=4 expandtab: */

+ 1 - 2
src/audio/SDL_sysaudio.h

@@ -26,6 +26,7 @@
 #include "SDL_mutex.h"
 #include "SDL_mutex.h"
 #include "SDL_thread.h"
 #include "SDL_thread.h"
 #include "../SDL_dataqueue.h"
 #include "../SDL_dataqueue.h"
+#include "./SDL_audio_c.h"
 
 
 /* !!! FIXME: These are wordy and unlocalized... */
 /* !!! FIXME: These are wordy and unlocalized... */
 #define DEFAULT_OUTPUT_DEVNAME "System audio output device"
 #define DEFAULT_OUTPUT_DEVNAME "System audio output device"
@@ -35,8 +36,6 @@
 typedef struct SDL_AudioDevice SDL_AudioDevice;
 typedef struct SDL_AudioDevice SDL_AudioDevice;
 #define _THIS   SDL_AudioDevice *_this
 #define _THIS   SDL_AudioDevice *_this
 
 
-typedef struct SDL_AudioStream SDL_AudioStream;
-
 /* Audio targets should call this as devices are added to the system (such as
 /* Audio targets should call this as devices are added to the system (such as
    a USB headset being plugged in), and should also be called for
    a USB headset being plugged in), and should also be called for
    for every device found during DetectDevices(). */
    for every device found during DetectDevices(). */