Updated to fix build system problem.

icculus · Oct 3, 2001 · a5d7b4c · a5d7b4c
1 parent 91aaa23
commit a5d7b4c
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 17 deletions.
diff --git a/decoders/aiff.c b/decoders/aiff.c
@@ -41,19 +41,20 @@
  *  This file was written by Torbjörn Andersson. (d91tan@Update.UU.SE)
  */
 
-#ifdef SOUND_SUPPORTS_AIFF
+#include "SDL_sound.h"
 
 #define __SDL_SOUND_INTERNAL__
 #include "SDL_sound_internal.h"
 
+#ifdef SOUND_SUPPORTS_AIFF
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
 
 #include "SDL.h"
 #include "SDL_endian.h"
-#include "SDL_sound.h"
 
 static int AIFF_init(void);
 static void AIFF_quit(void);

diff --git a/decoders/mod.c b/decoders/mod.c
@@ -28,16 +28,17 @@
  *  This file written by Torbjörn Andersson (d91tan@Update.UU.SE)
  */
 
-#ifdef SOUND_SUPPORTS_MOD
+#include "SDL_sound.h"
 
 #define __SDL_SOUND_INTERNAL__
 #include "SDL_sound_internal.h"
 
+#ifdef SOUND_SUPPORTS_MOD
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
-#include "SDL_sound.h"
 #include "mikmod.h"
 
 

diff --git a/decoders/mp3.c b/decoders/mp3.c
@@ -29,18 +29,19 @@
  *  This file written by Ryan C. Gordon. (icculus@clutteredmind.org)
  */
 
-#ifdef SOUND_SUPPORTS_MP3
+#include "SDL_sound.h"
 
 #define __SDL_SOUND_INTERNAL__
 #include "SDL_sound_internal.h"
 
+#ifdef SOUND_SUPPORTS_MP3
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
 
 #include "smpeg.h"
-#include "SDL_sound.h"
 #include "extra_rwops.h"
 
 

diff --git a/decoders/ogg.c b/decoders/ogg.c
@@ -32,19 +32,20 @@
  *  This file written by Ryan C. Gordon. (icculus@clutteredmind.org)
  */
 
-#ifdef SOUND_SUPPORTS_OGG
+#include "SDL_sound.h"
 
 #define __SDL_SOUND_INTERNAL__
 #include "SDL_sound_internal.h"
 
+#ifdef SOUND_SUPPORTS_OGG
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
 #include <assert.h>
 #include "vorbis/codec.h"
 #include "vorbis/vorbisfile.h"
-#include "SDL_sound.h"
 
 
 static int OGG_init(void);

diff --git a/decoders/raw.c b/decoders/raw.c
@@ -38,17 +38,17 @@
  *  This file written by Ryan C. Gordon. (icculus@clutteredmind.org)
  */
 
-#ifdef SOUND_SUPPORTS_RAW
+#include "SDL_sound.h"
 
 #define __SDL_SOUND_INTERNAL__
 #include "SDL_sound_internal.h"
 
+#ifdef SOUND_SUPPORTS_RAW
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
-#include "SDL_sound.h"
-
 
 static int RAW_init(void);
 static void RAW_quit(void);

diff --git a/decoders/shn.c b/decoders/shn.c
@@ -41,16 +41,17 @@
  *  This file written by Ryan C. Gordon. (icculus@clutteredmind.org)
  */
 
-#if (defined SOUND_SUPPORTS_SHN)
+#include "SDL_sound.h"
 
 #define __SDL_SOUND_INTERNAL__
 #include "SDL_sound_internal.h"
 
+#if (defined SOUND_SUPPORTS_SHN)
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
-#include "SDL_sound.h"
 
 
 static int SHN_init(void);

diff --git a/decoders/voc.c b/decoders/voc.c
@@ -37,16 +37,17 @@
  *  This file written by Ryan C. Gordon. (icculus@clutteredmind.org)
  */
 
-#if (defined SOUND_SUPPORTS_VOC)
+#include "SDL_sound.h"
 
 #define __SDL_SOUND_INTERNAL__
 #include "SDL_sound_internal.h"
 
+#if (defined SOUND_SUPPORTS_VOC)
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
-#include "SDL_sound.h"
 
 static int VOC_init(void);
 static void VOC_quit(void);

diff --git a/decoders/wav.c b/decoders/wav.c
@@ -28,16 +28,17 @@
  *  This file written by Ryan C. Gordon. (icculus@clutteredmind.org)
  */
 
-#ifdef SOUND_SUPPORTS_WAV
+#include "SDL_sound.h"
 
 #define __SDL_SOUND_INTERNAL__
 #include "SDL_sound_internal.h"
 
+#ifdef SOUND_SUPPORTS_WAV
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
-#include "SDL_sound.h"
 
 static int WAV_init(void);
 static void WAV_quit(void);