diff options
| author | Tim-Philipp Müller <tim@centricular.net> | 2006-03-22 17:13:32 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.net> | 2006-03-22 17:13:32 +0000 |
| commit | a79a53fc899a3c7e6baa06f9cb9d09c5bac064d3 (patch) | |
| tree | 43d973d8ce5c3b7fc34cb81106b86dbbc3dd657d | |
| parent | 2d0ec410ae954435e84a95c6ecc0c753fa10d8a7 (diff) | |
| download | gst-plugins-bad-a79a53fc899a3c7e6baa06f9cb9d09c5bac064d3.tar.gz gst-plugins-bad-a79a53fc899a3c7e6baa06f9cb9d09c5bac064d3.tar.bz2 gst-plugins-bad-a79a53fc899a3c7e6baa06f9cb9d09c5bac064d3.zip | |
gst/modplug/libmodplug/: Try that again (not only should it be MODPLUG_ instead of MODFILE, also that define is alrea...
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).
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | gst/modplug/libmodplug/Makefile.am | 2 | ||||
| -rw-r--r-- | gst/modplug/libmodplug/load_it.cpp | 2 |
3 files changed, 11 insertions, 1 deletions
@@ -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 f5cb3391..b900a60d 100644 --- 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 29ea0d24..d6222e92 100644 --- 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) //----------------------------------------------------------- |