# HG changeset patch # User Ryan C. Gordon # Date 1002133772 0 # Node ID 40de367eb59e2c407135ea1f9683c7b72bfa1399 # Parent de42ca5599ac95fa12706131ec15e084aefa9d93 Changing my include structure to do this right. diff -r de42ca5599ac -r 40de367eb59e decoders/aiff.c --- a/decoders/aiff.c Wed Oct 03 18:17:47 2001 +0000 +++ b/decoders/aiff.c Wed Oct 03 18:29:32 2001 +0000 @@ -41,10 +41,9 @@ * This file was written by Torbjörn Andersson. (d91tan@Update.UU.SE) */ -#include "SDL_sound.h" - -#define __SDL_SOUND_INTERNAL__ -#include "SDL_sound_internal.h" +#if HAVE_CONFIG_H +# include +#endif #ifdef SOUND_SUPPORTS_AIFF @@ -53,7 +52,11 @@ #include #include -#include "SDL.h" +#include "SDL_sound.h" + +#define __SDL_SOUND_INTERNAL__ +#include "SDL_sound_internal.h" + #include "SDL_endian.h" static int AIFF_init(void); diff -r de42ca5599ac -r 40de367eb59e decoders/mod.c --- a/decoders/mod.c Wed Oct 03 18:17:47 2001 +0000 +++ b/decoders/mod.c Wed Oct 03 18:29:32 2001 +0000 @@ -28,10 +28,9 @@ * This file written by Torbjörn Andersson (d91tan@Update.UU.SE) */ -#include "SDL_sound.h" - -#define __SDL_SOUND_INTERNAL__ -#include "SDL_sound_internal.h" +#if HAVE_CONFIG_H +# include +#endif #ifdef SOUND_SUPPORTS_MOD @@ -39,6 +38,12 @@ #include #include #include + +#include "SDL_sound.h" + +#define __SDL_SOUND_INTERNAL__ +#include "SDL_sound_internal.h" + #include "mikmod.h" diff -r de42ca5599ac -r 40de367eb59e decoders/mp3.c --- a/decoders/mp3.c Wed Oct 03 18:17:47 2001 +0000 +++ b/decoders/mp3.c Wed Oct 03 18:29:32 2001 +0000 @@ -29,10 +29,9 @@ * This file written by Ryan C. Gordon. (icculus@clutteredmind.org) */ -#include "SDL_sound.h" - -#define __SDL_SOUND_INTERNAL__ -#include "SDL_sound_internal.h" +#if HAVE_CONFIG_H +# include +#endif #ifdef SOUND_SUPPORTS_MP3 @@ -41,6 +40,11 @@ #include #include +#include "SDL_sound.h" + +#define __SDL_SOUND_INTERNAL__ +#include "SDL_sound_internal.h" + #include "smpeg.h" #include "extra_rwops.h" diff -r de42ca5599ac -r 40de367eb59e decoders/ogg.c --- a/decoders/ogg.c Wed Oct 03 18:17:47 2001 +0000 +++ b/decoders/ogg.c Wed Oct 03 18:29:32 2001 +0000 @@ -32,10 +32,9 @@ * This file written by Ryan C. Gordon. (icculus@clutteredmind.org) */ -#include "SDL_sound.h" - -#define __SDL_SOUND_INTERNAL__ -#include "SDL_sound_internal.h" +#if HAVE_CONFIG_H +# include +#endif #ifdef SOUND_SUPPORTS_OGG @@ -44,6 +43,12 @@ #include #include #include + +#include "SDL_sound.h" + +#define __SDL_SOUND_INTERNAL__ +#include "SDL_sound_internal.h" + #include "vorbis/codec.h" #include "vorbis/vorbisfile.h" diff -r de42ca5599ac -r 40de367eb59e decoders/raw.c --- a/decoders/raw.c Wed Oct 03 18:17:47 2001 +0000 +++ b/decoders/raw.c Wed Oct 03 18:29:32 2001 +0000 @@ -38,10 +38,9 @@ * This file written by Ryan C. Gordon. (icculus@clutteredmind.org) */ -#include "SDL_sound.h" - -#define __SDL_SOUND_INTERNAL__ -#include "SDL_sound_internal.h" +#if HAVE_CONFIG_H +# include +#endif #ifdef SOUND_SUPPORTS_RAW @@ -50,6 +49,11 @@ #include #include +#include "SDL_sound.h" + +#define __SDL_SOUND_INTERNAL__ +#include "SDL_sound_internal.h" + static int RAW_init(void); static void RAW_quit(void); static int RAW_open(Sound_Sample *sample, const char *ext); diff -r de42ca5599ac -r 40de367eb59e decoders/shn.c --- a/decoders/shn.c Wed Oct 03 18:17:47 2001 +0000 +++ b/decoders/shn.c Wed Oct 03 18:29:32 2001 +0000 @@ -41,10 +41,9 @@ * This file written by Ryan C. Gordon. (icculus@clutteredmind.org) */ -#include "SDL_sound.h" - -#define __SDL_SOUND_INTERNAL__ -#include "SDL_sound_internal.h" +#if HAVE_CONFIG_H +# include +#endif #if (defined SOUND_SUPPORTS_SHN) @@ -53,6 +52,11 @@ #include #include +#include "SDL_sound.h" + +#define __SDL_SOUND_INTERNAL__ +#include "SDL_sound_internal.h" + static int SHN_init(void); static void SHN_quit(void); diff -r de42ca5599ac -r 40de367eb59e decoders/skeleton.c --- a/decoders/skeleton.c Wed Oct 03 18:17:47 2001 +0000 +++ b/decoders/skeleton.c Wed Oct 03 18:29:32 2001 +0000 @@ -34,10 +34,9 @@ #error You should base your code on this file, and remove these error lines #error from your version. -#include "SDL_sound.h" - -#define __SDL_SOUND_INTERNAL__ -#include "SDL_sound_internal.h" +#if HAVE_CONFIG_H +# include +#endif #ifdef SOUND_SUPPORTS_FMT @@ -46,6 +45,11 @@ #include #include +#include "SDL_sound.h" + +#define __SDL_SOUND_INTERNAL__ +#include "SDL_sound_internal.h" + static int FMT_init(void); static void FMT_quit(void); static int FMT_open(Sound_Sample *sample, const char *ext); diff -r de42ca5599ac -r 40de367eb59e decoders/voc.c --- a/decoders/voc.c Wed Oct 03 18:17:47 2001 +0000 +++ b/decoders/voc.c Wed Oct 03 18:29:32 2001 +0000 @@ -37,10 +37,9 @@ * This file written by Ryan C. Gordon. (icculus@clutteredmind.org) */ -#include "SDL_sound.h" - -#define __SDL_SOUND_INTERNAL__ -#include "SDL_sound_internal.h" +#if HAVE_CONFIG_H +# include +#endif #if (defined SOUND_SUPPORTS_VOC) @@ -49,6 +48,11 @@ #include #include +#include "SDL_sound.h" + +#define __SDL_SOUND_INTERNAL__ +#include "SDL_sound_internal.h" + static int VOC_init(void); static void VOC_quit(void); static int VOC_open(Sound_Sample *sample, const char *ext); diff -r de42ca5599ac -r 40de367eb59e decoders/wav.c --- a/decoders/wav.c Wed Oct 03 18:17:47 2001 +0000 +++ b/decoders/wav.c Wed Oct 03 18:29:32 2001 +0000 @@ -28,10 +28,9 @@ * This file written by Ryan C. Gordon. (icculus@clutteredmind.org) */ -#include "SDL_sound.h" - -#define __SDL_SOUND_INTERNAL__ -#include "SDL_sound_internal.h" +#if HAVE_CONFIG_H +# include +#endif #ifdef SOUND_SUPPORTS_WAV @@ -40,6 +39,11 @@ #include #include +#include "SDL_sound.h" + +#define __SDL_SOUND_INTERNAL__ +#include "SDL_sound_internal.h" + static int WAV_init(void); static void WAV_quit(void); static int WAV_open(Sound_Sample *sample, const char *ext);