# HG changeset patch
# User Ryan C. Gordon <icculus@icculus.org>
# Date 1001374399 0
# Node ID 40006625142a954c289114047c30429797af23e5
# Parent  9669aa13d3e04908a8ca9bed39345ef13ba6ec00
Changes in preparation of autoconf support.

diff -r 9669aa13d3e0 -r 40006625142a decoders/aiff.c
--- a/decoders/aiff.c	Mon Sep 24 23:32:29 2001 +0000
+++ b/decoders/aiff.c	Mon Sep 24 23:33:19 2001 +0000
@@ -41,6 +41,8 @@
  *  This file was written by Torbjörn Andersson. (d91tan@Update.UU.SE)
  */
 
+#ifdef SOUND_SUPPORTS_AIFF
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -53,10 +55,6 @@
 #define __SDL_SOUND_INTERNAL__
 #include "SDL_sound_internal.h"
 
-#if (!defined SOUND_SUPPORTS_AIFF)
-#error SOUND_SUPPORTS_AIFF must be defined.
-#endif
-
 static int AIFF_init(void);
 static void AIFF_quit(void);
 static int AIFF_open(Sound_Sample *sample, const char *ext);
@@ -388,5 +386,7 @@
     return(retval);
 } /* AIFF_read */
 
+#endif /* SOUND_SUPPORTS_AIFF */
+
 
 /* end of aiff.c ... */
diff -r 9669aa13d3e0 -r 40006625142a decoders/mod.c
--- a/decoders/mod.c	Mon Sep 24 23:32:29 2001 +0000
+++ b/decoders/mod.c	Mon Sep 24 23:33:19 2001 +0000
@@ -29,6 +29,8 @@
  *  This file written by Torbjörn Andersson (d91tan@Update.UU.SE)
  */
 
+#ifdef SOUND_SUPPORTS_MOD
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -39,10 +41,6 @@
 #define __SDL_SOUND_INTERNAL__
 #include "SDL_sound_internal.h"
 
-#if (!defined SOUND_SUPPORTS_MOD)
-#error SOUND_SUPPORTS_MOD must be defined.
-#endif
-
 static int MOD_init(void);
 static void MOD_quit(void);
 static int MOD_open(Sound_Sample *sample, const char *ext);
@@ -266,6 +264,8 @@
     return((Uint32) VC_WriteBytes(internal->buffer, internal->buffer_size));
 } /* MOD_read */
 
+#endif /* SOUND_SUPPORTS_MOD */
+
 
 /* end of mod.c ... */
 
diff -r 9669aa13d3e0 -r 40006625142a decoders/mp3.c
--- a/decoders/mp3.c	Mon Sep 24 23:32:29 2001 +0000
+++ b/decoders/mp3.c	Mon Sep 24 23:33:19 2001 +0000
@@ -29,6 +29,8 @@
  *  This file written by Ryan C. Gordon. (icculus@clutteredmind.org)
  */
 
+#ifdef SOUND_SUPPORTS_MP3
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -41,10 +43,6 @@
 #define __SDL_SOUND_INTERNAL__
 #include "SDL_sound_internal.h"
 
-#if (!defined SOUND_SUPPORTS_MP3)
-#error SOUND_SUPPORTS_MP3 must be defined.
-#endif
-
 
 static int MP3_init(void);
 static void MP3_quit(void);
@@ -223,5 +221,7 @@
     return(retval);
 } /* MP3_read */
 
+#endif /* SOUND_SUPPORTS_MP3 */
+
 /* end of mp3.c ... */
 
diff -r 9669aa13d3e0 -r 40006625142a decoders/raw.c
--- a/decoders/raw.c	Mon Sep 24 23:32:29 2001 +0000
+++ b/decoders/raw.c	Mon Sep 24 23:33:19 2001 +0000
@@ -38,6 +38,8 @@
  *  This file written by Ryan C. Gordon. (icculus@clutteredmind.org)
  */
 
+#ifdef SOUND_SUPPORTS_RAW
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -47,10 +49,6 @@
 #define __SDL_SOUND_INTERNAL__
 #include "SDL_sound_internal.h"
 
-#if (!defined SOUND_SUPPORTS_RAW)
-#error SOUND_SUPPORTS_RAW must be defined.
-#endif
-
 
 static int RAW_init(void);
 static void RAW_quit(void);
@@ -156,6 +154,8 @@
     return(retval);
 } /* RAW_read */
 
+#endif /* SOUND_SUPPORTS_RAW */
+
 
 /* end of raw.c ... */
 
diff -r 9669aa13d3e0 -r 40006625142a decoders/skeleton.c
--- a/decoders/skeleton.c	Mon Sep 24 23:32:29 2001 +0000
+++ b/decoders/skeleton.c	Mon Sep 24 23:33:19 2001 +0000
@@ -29,6 +29,8 @@
  *  This file written by Ryan C. Gordon. (icculus@clutteredmind.org)
  */
 
+#ifdef SOUND_SUPPORTS_FMT
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -38,10 +40,6 @@
 #define __SDL_SOUND_INTERNAL__
 #include "SDL_sound_internal.h"
 
-#if (!defined SOUND_SUPPORTS_FMT)
-#error SOUND_SUPPORTS_FMT must be defined.
-#endif
-
 
 static int FMT_init(void);
 static void FMT_quit(void);
@@ -135,6 +133,8 @@
     return(retval);
 } /* FMT_read */
 
+#endif /* SOUND_SUPPORTS_FMT */
+
 
 /* end of fmt.c ... */
 
diff -r 9669aa13d3e0 -r 40006625142a decoders/voc.c
--- a/decoders/voc.c	Mon Sep 24 23:32:29 2001 +0000
+++ b/decoders/voc.c	Mon Sep 24 23:33:19 2001 +0000
@@ -37,6 +37,8 @@
  *  This file written by Ryan C. Gordon. (icculus@clutteredmind.org)
  */
 
+#if (defined SOUND_SUPPORTS_VOC)
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -46,11 +48,6 @@
 #define __SDL_SOUND_INTERNAL__
 #include "SDL_sound_internal.h"
 
-#if (!defined SOUND_SUPPORTS_VOC)
-#error SOUND_SUPPORTS_VOC must be defined.
-#endif
-
-
 static int VOC_init(void);
 static void VOC_quit(void);
 static int VOC_open(Sound_Sample *sample, const char *ext);
@@ -484,6 +481,6 @@
     return(v->bufpos);
 } /* VOC_read */
 
+#endif /* SOUND_SUPPORTS_VOC */
 
 /* end of voc.c ... */
-
diff -r 9669aa13d3e0 -r 40006625142a decoders/wav.c
--- a/decoders/wav.c	Mon Sep 24 23:32:29 2001 +0000
+++ b/decoders/wav.c	Mon Sep 24 23:33:19 2001 +0000
@@ -28,6 +28,8 @@
  *  This file written by Ryan C. Gordon. (icculus@clutteredmind.org)
  */
 
+#ifdef SOUND_SUPPORTS_WAV
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -37,10 +39,6 @@
 #define __SDL_SOUND_INTERNAL__
 #include "SDL_sound_internal.h"
 
-#if (!defined SOUND_SUPPORTS_WAV)
-#error SOUND_SUPPORTS_WAV must be defined.
-#endif
-
 static int WAV_init(void);
 static void WAV_quit(void);
 static int WAV_open(Sound_Sample *sample, const char *ext);
@@ -279,6 +277,7 @@
     return(retval);
 } /* WAV_read */
 
+#endif /* SOUND_SUPPORTS_WAV */
 
 /* end of wav.c ... */