summaryrefslogtreecommitdiffstats
path: root/gst
diff options
context:
space:
mode:
authorBenjamin Otte <otte@gnome.org>2003-05-22 17:51:01 +0000
committerBenjamin Otte <otte@gnome.org>2003-05-22 17:51:01 +0000
commitf3e0b840640f4fec0302eb8cd3836e3e794944d3 (patch)
tree13564633af1d78e3de9cdde0a236f8a77bb6e6bb /gst
parentf4e4c4b31e0c04fb15424e85b3a5ccb0eeba917b (diff)
downloadgst-plugins-bad-f3e0b840640f4fec0302eb8cd3836e3e794944d3.tar.gz
gst-plugins-bad-f3e0b840640f4fec0302eb8cd3836e3e794944d3.tar.bz2
gst-plugins-bad-f3e0b840640f4fec0302eb8cd3836e3e794944d3.zip
remove '__inline' stuff and take normal 'inline' instead
Original commit message from CVS: remove '__inline' stuff and take normal 'inline' instead
Diffstat (limited to 'gst')
-rw-r--r--gst/modplug/libmodplug/sndfile.h8
1 files changed, 2 insertions, 6 deletions
diff --git a/gst/modplug/libmodplug/sndfile.h b/gst/modplug/libmodplug/sndfile.h
index 4be08a0f..b322f636 100644
--- a/gst/modplug/libmodplug/sndfile.h
+++ b/gst/modplug/libmodplug/sndfile.h
@@ -16,10 +16,6 @@
typedef const BYTE * LPCBYTE;
#endif
-#ifndef __inline
-#define __inline
-#endif
-
#define MOD_AMIGAC2 0x1AB
#define MAX_SAMPLE_LENGTH 16000000
#define MAX_SAMPLE_RATE 50000
@@ -944,7 +940,7 @@ int _muldivr(long a, long b, long c);
({ unsigned short int __bsx = (x); \
((((__bsx) >> 8) & 0xff) | (((__bsx) & 0xff) << 8)); }))
#else
-static __inline unsigned short int
+static inline unsigned short int
bswap_16 (unsigned short int __bsx)
{
return ((((__bsx) >> 8) & 0xff) | (((__bsx) & 0xff) << 8));
@@ -959,7 +955,7 @@ bswap_16 (unsigned short int __bsx)
((((__bsx) & 0xff000000) >> 24) | (((__bsx) & 0x00ff0000) >> 8) | \
(((__bsx) & 0x0000ff00) << 8) | (((__bsx) & 0x000000ff) << 24)); }))
#else
-static __inline unsigned int
+static inline unsigned int
bswap_32 (unsigned int __bsx)
{
return ((((__bsx) & 0xff000000) >> 24) | (((__bsx) & 0x00ff0000) >> 8) |