# HG changeset patch
# User Chris Cannam
# Date 1209462284 0
# Node ID 65311fb86166e38a0929393b0da8b88d6e18a454
# Parent  4884fba80e00cc85935b116a7448a7d1e476668c
* Merge rev 1048 (build fixes) from rdf-import branch

diff -r 4884fba80e00 -r 65311fb86166 base/RealTime.cpp
--- 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
diff -r 4884fba80e00 -r 65311fb86166 base/Window.h
--- 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,
diff -r 4884fba80e00 -r 65311fb86166 data/fileio/FileSource.cpp
--- 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
 
diff -r 4884fba80e00 -r 65311fb86166 data/fileio/MP3FileReader.cpp
--- 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;
 }
diff -r 4884fba80e00 -r 65311fb86166 data/fileio/MatrixFile.cpp
--- 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>
 
diff -r 4884fba80e00 -r 65311fb86166 plugin/DSSIPluginFactory.cpp
--- 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"
 
diff -r 4884fba80e00 -r 65311fb86166 plugin/DSSIPluginInstance.cpp
--- 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
 
diff -r 4884fba80e00 -r 65311fb86166 plugin/plugins/SamplePlayer.cpp
--- a/plugin/plugins/SamplePlayer.cpp	Tue Apr 29 09:42:18 2008 +0000
+++ b/plugin/plugins/SamplePlayer.cpp	Tue Apr 29 09:44:44 2008 +0000
@@ -21,6 +21,7 @@
 
 #include <dssi.h>
 #include <cmath>
+#include <cstdlib>
 
 #include <QMutexLocker>
 #include <QDir>
diff -r 4884fba80e00 -r 65311fb86166 system/System.cpp
--- a/system/System.cpp	Tue Apr 29 09:42:18 2008 +0000
+++ b/system/System.cpp	Tue Apr 29 09:44:44 2008 +0000
@@ -30,6 +30,9 @@
 #include <sys/sysctl.h>
 #endif
 
+#include <limits.h>
+#include <cstdlib>
+
 #include <iostream>
 
 #ifdef __APPLE__