# HG changeset patch
# User Chris Cannam
# Date 1364213950 0
# Node ID 81fac6dadb7502fc51ce7f3069503d6e534b1d9f
# Parent  33ac6d05a1a6e1aa823c99db34670644efa9d727# Parent  2444ef08b7eb8bad9bb46fc297d0fbd729d8849c
'Merge'

diff -r 33ac6d05a1a6 -r 81fac6dadb75 data/fileio/test/test.pro
--- a/data/fileio/test/test.pro	Mon Mar 25 12:19:01 2013 +0000
+++ b/data/fileio/test/test.pro	Mon Mar 25 12:19:10 2013 +0000
@@ -36,5 +36,5 @@
     }
 }
 
-win32:QMAKE_POST_LINK=.$${TARGET}.exe
+win32:QMAKE_POST_LINK=./release/$${TARGET}.exe
 
diff -r 33ac6d05a1a6 -r 81fac6dadb75 system/System.cpp
--- a/system/System.cpp	Mon Mar 25 12:19:01 2013 +0000
+++ b/system/System.cpp	Mon Mar 25 12:19:10 2013 +0000
@@ -56,10 +56,12 @@
 
 extern "C" {
 
+/* usleep is now in mingw
 void usleep(unsigned long usec)
 {
     ::Sleep(usec / 1000);
 }
+*/
 
 int gettimeofday(struct timeval *tv, void *tz)
 {
diff -r 33ac6d05a1a6 -r 81fac6dadb75 system/System.h
--- a/system/System.h	Mon Mar 25 12:19:01 2013 +0000
+++ b/system/System.h	Mon Mar 25 12:19:10 2013 +0000
@@ -57,12 +57,14 @@
 #define getpid _getpid
 
 extern "C" {
+/* usleep is now in mingw
 void usleep(unsigned long usec);
+*/
 int gettimeofday(struct timeval *p, void *tz);
 }
 
-#define ISNAN _isnan
-#define ISINF _isinf
+#define ISNAN std::isnan
+#define ISINF std::isinf
 
 #else