# HG changeset patch
# User Chris Cannam
# Date 1287402162 -3600
# Node ID 29efe322ab47e97c623457e493d737040cb3171d
# Parent  1bb85de8c5b933d0db1ae62b6b36e6dd4d322779
* Build fixes

diff -r 1bb85de8c5b9 -r 29efe322ab47 base/Profiler.cpp
--- a/base/Profiler.cpp	Fri Oct 08 13:30:47 2010 +0100
+++ b/base/Profiler.cpp	Mon Oct 18 12:42:42 2010 +0100
@@ -22,6 +22,8 @@
 #include <iostream>
 #include "Profiler.h"
 
+#include <cstdio>
+
 #include <vector>
 #include <algorithm>
 #include <set>
diff -r 1bb85de8c5b9 -r 29efe322ab47 base/TempDirectory.cpp
--- a/base/TempDirectory.cpp	Fri Oct 08 13:30:47 2010 +0100
+++ b/base/TempDirectory.cpp	Mon Oct 18 12:42:42 2010 +0100
@@ -25,6 +25,7 @@
 #include <iostream>
 #include <cassert>
 #include <unistd.h>
+#include <time.h>
 
 TempDirectory *
 TempDirectory::m_instance = new TempDirectory;
diff -r 1bb85de8c5b9 -r 29efe322ab47 data/fileio/FileReadThread.cpp
--- a/data/fileio/FileReadThread.cpp	Fri Oct 08 13:30:47 2010 +0100
+++ b/data/fileio/FileReadThread.cpp	Mon Oct 18 12:42:42 2010 +0100
@@ -20,6 +20,7 @@
 
 #include <iostream>
 #include <unistd.h>
+#include <cstdio>
 
 //#define DEBUG_FILE_READ_THREAD 1
 
diff -r 1bb85de8c5b9 -r 29efe322ab47 data/model/WaveFileModel.h
--- a/data/model/WaveFileModel.h	Fri Oct 08 13:30:47 2010 +0100
+++ b/data/model/WaveFileModel.h	Mon Oct 18 12:42:42 2010 +0100
@@ -86,11 +86,6 @@
                        QString indent = "",
                        QString extraAttributes = "") const;
 
-signals:
-    void modelChanged();
-    void modelChanged(size_t, size_t);
-    void completionChanged();
-
 protected slots:
     void fillTimerTimedOut();
     void cacheFilled();
diff -r 1bb85de8c5b9 -r 29efe322ab47 plugin/DSSIPluginInstance.cpp
--- a/plugin/DSSIPluginInstance.cpp	Fri Oct 08 13:30:47 2010 +0100
+++ b/plugin/DSSIPluginInstance.cpp	Mon Oct 18 12:42:42 2010 +0100
@@ -27,7 +27,11 @@
 
 #include <cstdlib>
 
+#ifndef Q_OS_WIN32
 #include <alloca.h>
+#else
+#include <memory.h>
+#endif
 
 //#define DEBUG_DSSI 1
 //#define DEBUG_DSSI_PROCESS 1
diff -r 1bb85de8c5b9 -r 29efe322ab47 system/Init.cpp
--- a/system/Init.cpp	Fri Oct 08 13:30:47 2010 +0100
+++ b/system/Init.cpp	Mon Oct 18 12:42:42 2010 +0100
@@ -15,6 +15,8 @@
 
 #include <iostream>
 
+#include <qglobal.h>
+
 #ifdef Q_WS_X11
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
@@ -38,6 +40,9 @@
 #ifdef Q_WS_WIN32
 
 #include <fcntl.h>
+
+// required for SetDllDirectory
+#define _WIN32_WINNT 0x0502
 #include <windows.h>
 
 // Set default file open mode to binary
@@ -46,6 +51,7 @@
 
 void redirectStderr()
 {
+#ifdef NO_PROBABLY_NOT
     HANDLE stderrHandle = GetStdHandle(STD_ERROR_HANDLE);
     if (!stderrHandle) return;
 
@@ -64,6 +70,7 @@
             setvbuf(stderr, NULL, _IONBF, 0);
         }
     }
+#endif
 }
 
 #endif
@@ -76,6 +83,10 @@
 
 #ifdef Q_WS_WIN32
     redirectStderr();
+
+    // Remove the CWD from the DLL search path, just in case
+    SetDllDirectory(L"");
+    putenv("PATH=");
 #else
 #endif
 }