X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FWinDefs.h;h=47fb4d3d47b273c15201a45875f8f0d8b62686bf;hb=5931bd1edf827e8645f89b5a4a16585cb25bc6e1;hp=e598863b4151e066ab4b8fd9753b339e27fd05e4;hpb=9e1a507cf6f084fa2118905cc8cdc854c64ae64b;p=lugaru.git

diff --git a/Source/WinDefs.h b/Source/WinDefs.h
index e598863..47fb4d3 100644
--- a/Source/WinDefs.h
+++ b/Source/WinDefs.h
@@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 
 #include <stdio.h>
-#include <float.h>
+#include <math.h>
 
 // stuff to make Mac code compatable with Windows
 
@@ -42,11 +42,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 typedef bool Boolean;
 
-
-struct Point
-{
-	short v;
-	short h;
+struct Point {
+    short v;
+    short h;
 };
 
 typedef signed char SInt8;
@@ -60,18 +58,16 @@ void CopyCStringToPascal( const char* src, unsigned char dst[256]);
 void CopyPascalStringToC( const unsigned char* src, char* dst);
 
 
-typedef struct AbsoluteTime
-{
+typedef struct AbsoluteTime {
     unsigned long   hi;
     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;
 
-enum
-{
+enum {
     durationMicrosecond             = -1,
     durationMillisecond             = 1,
     durationSecond                  = 1000,
@@ -85,13 +81,13 @@ enum
 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 ':'
@@ -99,21 +95,23 @@ char* ConvertFileName( const char* orgfilename);
 char* ConvertFileName( const char* orgfilename, const char* junk);
 
 
-#define fopen( a, b) fopen( ConvertFileName( a), b);
+#define fopen(a, b) fopen(ConvertFileName(a), b);
 
-inline float abs( float f)
+#ifndef __MINGW32__
+inline float abs(float f)
 {
-	if (f < 0)
-		return -f;
-	return f;
+    if (f < 0)
+        return -f;
+    return f;
 }
 
-inline double abs( double f)
+inline double abs(double f)
 {
-	if (f < 0)
-		return -f;
-	return f;
+    if (f < 0)
+        return -f;
+    return f;
 }
+#endif // __MINGW32__
 
 
 #endif