# HG changeset patch
# User Chris Cannam
# Date 1251130043 0
# Node ID 02d9664906e8c9a5be1856b860113c8611de7093
# Parent  5eb5449432f5be0e40a22965703de529608dec6b
* Fixes to gcc-4.4 thanks to Michel Salim

diff -r 5eb5449432f5 -r 02d9664906e8 rdf/RDFFeatureWriter.cpp
--- a/rdf/RDFFeatureWriter.cpp	Tue Aug 18 11:08:29 2009 +0000
+++ b/rdf/RDFFeatureWriter.cpp	Mon Aug 24 16:07:23 2009 +0000
@@ -319,7 +319,7 @@
 
     // Note reviewFileForAppending above (when opening in append mode)
 
-    uint64_t signalCount = m_count++;
+    unsigned long signalCount = m_count++;
 
     if (m_trackSignalURIs.find(trackId) == m_trackSignalURIs.end()) {
         m_trackSignalURIs[trackId] = QString(":signal_%1").arg(signalCount);
@@ -537,7 +537,7 @@
     for (int i = 0; i < featureList.size(); ++i) {
 
         const Plugin::Feature &feature = featureList[i];
-        uint64_t featureNumber = m_count++;
+        unsigned long featureNumber = m_count++;
 
         stream << ":event_" << featureNumber << " a ";
 
@@ -671,7 +671,7 @@
         bool plain = (m_plain || !desc.haveDescription());
         QString outputId = od.identifier.c_str();
 
-        uint64_t featureNumber = m_count++;
+        unsigned long featureNumber = m_count++;
 
         // need to write out feature timeline map -- for this we need
         // the sample rate, window length and hop size from the
diff -r 5eb5449432f5 -r 02d9664906e8 rdf/RDFFeatureWriter.h
--- a/rdf/RDFFeatureWriter.h	Tue Aug 18 11:08:29 2009 +0000
+++ b/rdf/RDFFeatureWriter.h	Mon Aug 24 16:07:23 2009 +0000
@@ -123,7 +123,7 @@
     bool m_network;
     bool m_networkRetrieved;
 
-    uint64_t m_count;
+    unsigned long m_count;
 };
 
 #endif
diff -r 5eb5449432f5 -r 02d9664906e8 system/System.h
--- a/system/System.h	Tue Aug 18 11:08:29 2009 +0000
+++ b/system/System.h	Mon Aug 24 16:07:23 2009 +0000
@@ -62,6 +62,7 @@
 
 #include <sys/mman.h>
 #include <dlfcn.h>
+#include <stdio.h> // for perror
 
 #define MLOCK(a,b)   ::mlock((a),(b))
 #define MUNLOCK(a,b) (::munlock((a),(b)) ? (::perror("munlock failed"), 0) : 0)