changeset 301:ca43129df299

Visual C fixes.
author Ryan C. Gordon <icculus@icculus.org>
date Mon, 25 Mar 2002 20:54:07 +0000
parents 338cd6c101e3
children 414cfef0978e
files SDL_sound_internal.h decoders/shn.c decoders/smpeg.c decoders/voc.c
diffstat 4 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/SDL_sound_internal.h	Mon Mar 25 20:53:48 2002 +0000
+++ b/SDL_sound_internal.h	Mon Mar 25 20:54:07 2002 +0000
@@ -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
--- a/decoders/shn.c	Mon Mar 25 20:53:48 2002 +0000
+++ b/decoders/shn.c	Mon Mar 25 20:54:07 2002 +0000
@@ -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);
--- a/decoders/smpeg.c	Mon Mar 25 20:53:48 2002 +0000
+++ b/decoders/smpeg.c	Mon Mar 25 20:54:07 2002 +0000
@@ -93,7 +93,7 @@
 } /* _SMPEG_quit */
 
 
-static __inline__ void output_version(void)
+static inline void output_version(void)
 {
     static int first_time = 1;
 
--- a/decoders/voc.c	Mon Mar 25 20:53:48 2002 +0000
+++ b/decoders/voc.c	Mon Mar 25 20:54:07 2002 +0000
@@ -139,7 +139,7 @@
 } /* 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" */