X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FWinDefs.h;h=47fb4d3d47b273c15201a45875f8f0d8b62686bf;hb=31801560f92e99939f40ee49d9c279324db044bb;hp=de92c5f7180534c0cab82776ddcd9b26f27757f2;hpb=24004d6ab1e68faaf85ece11b566449997da5013;p=lugaru.git

diff --git a/Source/WinDefs.h b/Source/WinDefs.h
index de92c5f..47fb4d3 100644
--- a/Source/WinDefs.h
+++ b/Source/WinDefs.h
@@ -63,7 +63,7 @@ typedef struct AbsoluteTime {
     unsigned long   lo;
 } AbsoluteTime;
 
-AbsoluteTime UpTime();		// NOTE: returns time since app started, not system start
+AbsoluteTime UpTime(); // NOTE: returns time since app started, not system start
 
 typedef long Duration;
 
@@ -84,13 +84,11 @@ Duration AbsoluteDeltaToDuration( AbsoluteTime& a, AbsoluteTime& b);
 /*
 inline bool isnormal( double x)
 {
-	int ret = _fpclass( x);
-	return (ret == _FPCLASS_NN || ret == _FPCLASS_PN);
+    int ret = _fpclass( x);
+    return (ret == _FPCLASS_NN || ret == _FPCLASS_PN);
 }
 */
 
-typedef unsigned int uintptr_t;
-
 
 // fix file names to use '/' instead of ':'
 char* ConvertFileName( const char* orgfilename);
@@ -99,6 +97,7 @@ char* ConvertFileName( const char* orgfilename, const char* junk);
 
 #define fopen(a, b) fopen(ConvertFileName(a), b);
 
+#ifndef __MINGW32__
 inline float abs(float f)
 {
     if (f < 0)
@@ -112,6 +111,7 @@ inline double abs(double f)
         return -f;
     return f;
 }
+#endif // __MINGW32__
 
 
 #endif