Visual C fixes.

icculus · Mar 25, 2002 · 3b47749 · 3b47749
1 parent 8a424a9
commit 3b47749
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/SDL_sound_internal.h b/SDL_sound_internal.h
@@ -35,6 +35,10 @@
 
 #include "SDL.h"
 
+#if ((defined _MSC_VER) && (!defined inline))
+#	define inline __inline__
+#endif
+
 #if (defined DEBUG_CHATTER)
 #define SNDDBG(x) printf x
 #else

diff --git a/decoders/shn.c b/decoders/shn.c
@@ -57,10 +57,6 @@
 #define __SDL_SOUND_INTERNAL__
 #include "SDL_sound_internal.h"
 
-#ifdef _MSC_VER
-#	define inline __inline
-#endif
-
 static int SHN_init(void);
 static void SHN_quit(void);
 static int SHN_open(Sound_Sample *sample, const char *ext);

diff --git a/decoders/smpeg.c b/decoders/smpeg.c
@@ -93,7 +93,7 @@ static void _SMPEG_quit(void)
 } /* _SMPEG_quit */
 
 
-static __inline__ void output_version(void)
+static inline void output_version(void)
 {
     static int first_time = 1;
 

diff --git a/decoders/voc.c b/decoders/voc.c
@@ -139,7 +139,7 @@ static void VOC_quit(void)
 } /* VOC_quit */
 
 
-static __inline__ int voc_check_header(SDL_RWops *src)
+static inline int voc_check_header(SDL_RWops *src)
 {
     /* VOC magic header */
     Uint8  signature[20];  /* "Creative Voice File\032" */