Mercurial > hg > svcore
changeset 405:65311fb86166
* Merge rev 1048 (build fixes) from rdf-import branch
author | Chris Cannam |
---|---|
date | Tue, 29 Apr 2008 09:44:44 +0000 (2008-04-29) |
parents | 4884fba80e00 |
children | d095214ffbaf |
files | base/RealTime.cpp base/Window.h data/fileio/FileSource.cpp data/fileio/MP3FileReader.cpp data/fileio/MatrixFile.cpp plugin/DSSIPluginFactory.cpp plugin/DSSIPluginInstance.cpp plugin/plugins/SamplePlayer.cpp system/System.cpp |
diffstat | 9 files changed, 19 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/base/RealTime.cpp Tue Apr 29 09:42:18 2008 +0000 +++ b/base/RealTime.cpp Tue Apr 29 09:44:44 2008 +0000 @@ -20,6 +20,8 @@ #include <iostream> +#include <cstdlib> + #if (__GNUC__ < 3) #include <strstream> #define stringstream strstream
--- a/base/Window.h Tue Apr 29 09:42:18 2008 +0000 +++ b/base/Window.h Tue Apr 29 09:44:44 2008 +0000 @@ -22,6 +22,8 @@ #include <map> #include <cstdlib> +#include <cstdlib> + enum WindowType { RectangularWindow, BartlettWindow,
--- a/data/fileio/FileSource.cpp Tue Apr 29 09:42:18 2008 +0000 +++ b/data/fileio/FileSource.cpp Tue Apr 29 09:44:44 2008 +0000 @@ -27,6 +27,7 @@ #include <QHttpResponseHeader> #include <iostream> +#include <cstdlib> //#define DEBUG_FILE_SOURCE 1
--- a/data/fileio/MP3FileReader.cpp Tue Apr 29 09:42:18 2008 +0000 +++ b/data/fileio/MP3FileReader.cpp Tue Apr 29 09:44:44 2008 +0000 @@ -27,6 +27,8 @@ #include <iostream> +#include <cstdlib> + #ifdef HAVE_ID3TAG #include <id3tag.h> #endif @@ -421,9 +423,9 @@ { DecoderData *data = (DecoderData *)dp; - fprintf(stderr, "decoding error 0x%04x (%s) at byte offset %u\n", + fprintf(stderr, "decoding error 0x%04x (%s) at byte offset %lu\n", stream->error, mad_stream_errorstr(stream), - stream->this_frame - data->start); + (unsigned long)(stream->this_frame - data->start)); return MAD_FLOW_CONTINUE; }
--- a/data/fileio/MatrixFile.cpp Tue Apr 29 09:42:18 2008 +0000 +++ b/data/fileio/MatrixFile.cpp Tue Apr 29 09:44:44 2008 +0000 @@ -29,6 +29,8 @@ #include <cstdio> #include <cassert> +#include <cstdlib> + #include <QFileInfo> #include <QDir>
--- a/plugin/DSSIPluginFactory.cpp Tue Apr 29 09:42:18 2008 +0000 +++ b/plugin/DSSIPluginFactory.cpp Tue Apr 29 09:44:44 2008 +0000 @@ -26,6 +26,8 @@ #include "DSSIPluginInstance.h" #include "PluginIdentifier.h" +#include <cstdlib> + //!!! #include "plugin/plugins/SamplePlayer.h"
--- a/plugin/DSSIPluginInstance.cpp Tue Apr 29 09:42:18 2008 +0000 +++ b/plugin/DSSIPluginInstance.cpp Tue Apr 29 09:44:44 2008 +0000 @@ -25,6 +25,8 @@ #include "PluginIdentifier.h" #include "LADSPAPluginFactory.h" +#include <cstdlib> + //#define DEBUG_DSSI 1 //#define DEBUG_DSSI_PROCESS 1