gst/modplug/libmodplug/: Try that again (not only should it be MODPLUG_ instead of...

Original commit message from CVS:
* gst/modplug/libmodplug/Makefile.am:
* gst/modplug/libmodplug/load_it.cpp:
Try that again (not only should it be MODPLUG_ instead
of MODFILE, also that define is already set in stdafx.h;
what we really need is some more #ifndefs).

diff --git a/ChangeLog b/ChangeLog
index 77728b6..6a7522d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,14 @@
 2006-03-22  Tim-Philipp Müller  <tim at centricular dot net>
 
        * gst/modplug/libmodplug/Makefile.am:
+       * gst/modplug/libmodplug/load_it.cpp:
+         Try that again (not only should it be MODPLUG_ instead
+         of MODFILE, also that define is already set in stdafx.h;
+         what we really need is some more #ifndefs).
+
+2006-03-22  Tim-Philipp Müller  <tim at centricular dot net>
+
+       * gst/modplug/libmodplug/Makefile.am:
          More gcc-4.1 fixes (we don't need file saving, so just
          define MODPLUG_NO_FILESAVE. That way, the compiler won't
          complain about modplug ignoring the return value of fwrite

diff --git a/gst/modplug/libmodplug/Makefile.am b/gst/modplug/libmodplug/Makefile.am
index f5cb339..b900a60 100644 (file)
--- a/gst/modplug/libmodplug/Makefile.am
+++ b/gst/modplug/libmodplug/Makefile.am
@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES = libmodplug.la
 
-libmodplug_la_CXXFLAGS = $(GST_CFLAGS) -D_REENTRANT -DMODFILE_NO_FILESAVE
+libmodplug_la_CXXFLAGS = $(GST_CFLAGS) -D_REENTRANT
 libmodplug_la_LDFLAGS = -module -avoid-version
 libmodplug_la_SOURCES = tables.cpp         \
                         sndmix.cpp         \

diff --git a/gst/modplug/libmodplug/load_it.cpp b/gst/modplug/libmodplug/load_it.cpp
index 29ea0d2..d6222e9 100644 (file)
--- a/gst/modplug/libmodplug/load_it.cpp
+++ b/gst/modplug/libmodplug/load_it.cpp
@@ -1290,6 +1290,7 @@ void ITUnpack16Bit(signed char *pSample, DWORD dwLen, LPBYTE lpMemFile, DWORD dw
        }
 }
 
+#ifndef MODPLUG_NO_FILESAVE
 
 UINT CSoundFile::SaveMixPlugins(FILE *f, BOOL bUpdate)
 //----------------------------------------------------
@@ -1357,6 +1358,7 @@ UINT CSoundFile::SaveMixPlugins(FILE *f, BOOL bUpdate)
        return nTotalSize;
 }
 
+#endif /* MODPLUG_NO_FILESAVE */
 
 UINT CSoundFile::LoadMixPlugins(const void *pData, UINT nLen)
 //-----------------------------------------------------------