Corrected modplug and monkeyaudio to build with non-gcc compilers.

Original commit message from CVS:
Corrected modplug and monkeyaudio to build with non-gcc compilers.

diff --git a/gst/monkeyaudio/libmonkeyaudio/BitArray.h b/gst/monkeyaudio/libmonkeyaudio/BitArray.h
index f19a460..4116a40 100644 (file)
--- a/gst/monkeyaudio/libmonkeyaudio/BitArray.h
+++ b/gst/monkeyaudio/libmonkeyaudio/BitArray.h
@@ -3,6 +3,10 @@
 
 #include "IO.h"
 
+#ifndef __inline
+#define __inline
+#endif
+
 //#define BUILD_RANGE_TABLE
 
 struct RANGE_CODER_STRUCT_COMPRESS

diff --git a/gst/monkeyaudio/libmonkeyaudio/NNFilter.h b/gst/monkeyaudio/libmonkeyaudio/NNFilter.h
index 4a0dd3f..eedf4c5 100644 (file)
--- a/gst/monkeyaudio/libmonkeyaudio/NNFilter.h
+++ b/gst/monkeyaudio/libmonkeyaudio/NNFilter.h
@@ -4,6 +4,10 @@
 #include "RollBuffer.h"
 #define NN_WINDOW_ELEMENTS  512
 
+#ifndef __inline
+#define __inline
+#endif
+
 #ifdef __GNUC_IA32__
 extern "C" {
     __inline void   Adapt                    ( short* pM, const short* pAdapt, int nDirection, int nOrder );

diff --git a/gst/monkeyaudio/libmonkeyaudio/RollBuffer.h b/gst/monkeyaudio/libmonkeyaudio/RollBuffer.h
index e0ec11e..f849ac7 100644 (file)
--- a/gst/monkeyaudio/libmonkeyaudio/RollBuffer.h
+++ b/gst/monkeyaudio/libmonkeyaudio/RollBuffer.h
@@ -1,6 +1,10 @@
 #ifndef APE_ROLLBUFFER_H
 #define APE_ROLLBUFFER_H
 
+#ifndef __inline
+#define __inline
+#endif
+
 template <class TYPE> class CRollBuffer
 {
 public:

diff --git a/gst/monkeyaudio/libmonkeyaudio/ScaledFirstOrderFilter.h b/gst/monkeyaudio/libmonkeyaudio/ScaledFirstOrderFilter.h
index 075a87b..8a87d4b 100644 (file)
--- a/gst/monkeyaudio/libmonkeyaudio/ScaledFirstOrderFilter.h
+++ b/gst/monkeyaudio/libmonkeyaudio/ScaledFirstOrderFilter.h
@@ -1,6 +1,10 @@
 #ifndef APE_SCALEFIRSTORDERFILER_H
 #define APE_SCALEFIRSTORDERFILER_H
 
+#ifndef __inline
+#define __inline
+#endif
+
 template <int MULTIPLY, int SHIFT> class CScaledFirstOrderFilter
 {
 public:

diff --git a/gst/monkeyaudio/libmonkeyaudio/SmartPtr.h b/gst/monkeyaudio/libmonkeyaudio/SmartPtr.h
index 2d74991..aff6c8b 100644 (file)
--- a/gst/monkeyaudio/libmonkeyaudio/SmartPtr.h
+++ b/gst/monkeyaudio/libmonkeyaudio/SmartPtr.h
@@ -1,6 +1,10 @@
 #ifndef APE_SMARTPTR_H
 #define APE_SMARTPTR_H
 
+#ifndef __inline
+#define __inline
+#endif
+
 // disable the operator -> on UDT warning
 #ifdef _WIN32
 # pragma warning( push )

diff --git a/gst/monkeyaudio/libmonkeyaudio/UnBitArray.h b/gst/monkeyaudio/libmonkeyaudio/UnBitArray.h
index f7cc516..7a07043 100644 (file)
--- a/gst/monkeyaudio/libmonkeyaudio/UnBitArray.h
+++ b/gst/monkeyaudio/libmonkeyaudio/UnBitArray.h
@@ -4,6 +4,10 @@
 #include "UnBitArrayBase.h"
 #include "BitArray.h"
 
+#ifndef __inline
+#define __inline
+#endif
+
 class IAPEDecompress;
 
 struct RANGE_CODER_STRUCT_DECOMPRESS