Mercurial > hg > svcore

changeset 766:2444ef08b7eb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Chris Cannam
date Mon, 25 Mar 2013 12:15:36 +0000
parents 001d77a720ce (diff) dc87569a196e (current diff)
children 81fac6dadb75 f3df2c35e6cd eea8049df526
files
diffstat 3 files changed, 7 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/data/fileio/test/test.pro	Mon Mar 11 11:49:16 2013 +0000
+++ b/data/fileio/test/test.pro	Mon Mar 25 12:15:36 2013 +0000
@@ -36,5 +36,5 @@
     }
 }
 
-win32:QMAKE_POST_LINK=.$${TARGET}.exe
+win32:QMAKE_POST_LINK=./release/$${TARGET}.exe
 
--- a/system/System.cpp	Mon Mar 11 11:49:16 2013 +0000
+++ b/system/System.cpp	Mon Mar 25 12:15:36 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)
 {
--- a/system/System.h	Mon Mar 11 11:49:16 2013 +0000
+++ b/system/System.h	Mon Mar 25 12:15:36 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