X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FWinDefs.h;h=2609273cd873fa9486ba1e99b52393e0bdf271f4;hb=8c5a754da6e78011ecbf6a8d1ab4469070cc72b8;hp=478c74435e234ca288b7c88ffe50187aed6f4246;hpb=0cca0c495c7dc29d134a10d7eed5de1f377c99bf;p=lugaru.git

diff --git a/Source/WinDefs.h b/Source/WinDefs.h
index 478c744..2609273 100644
--- a/Source/WinDefs.h
+++ b/Source/WinDefs.h
@@ -1,10 +1,31 @@
+/*
+Copyright (C) 2003, 2010 - Wolfire Games
+
+This file is part of Lugaru.
+
+Lugaru is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
 #ifndef _WINDEFS_H_
 #define _WINDEFS_H_
 #ifdef WIN32
 
 
 #include <stdio.h>
-#include <float.h>
+#include <math.h>
 
 // stuff to make Mac code compatable with Windows
 
@@ -21,11 +42,9 @@
 
 typedef bool Boolean;
 
-
-struct Point
-{
-	short v;
-	short h;
+struct Point {
+    short v;
+    short h;
 };
 
 typedef signed char SInt8;
@@ -39,64 +58,63 @@ void CopyCStringToPascal( const char* src, unsigned char dst[256]);
 void CopyPascalStringToC( const unsigned char* src, char* dst);
 
 
-typedef struct AbsoluteTime
-{
-	unsigned long   hi;
-	unsigned long   lo;
-} 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; 
+typedef long Duration;
 
-enum
-{
-	durationMicrosecond             = -1,
-	durationMillisecond             = 1,
-	durationSecond                  = 1000,
-	durationMinute                  = 1000 * 60,
-	durationHour                    = 1000 * 60 * 60,
-	durationDay                     = 1000 * 60 * 60 * 24,
-	durationForever                 = 0x7FFFFFFF,
-	durationImmediate               = 0,
-}; 
+enum {
+    durationMicrosecond             = -1,
+    durationMillisecond             = 1,
+    durationSecond                  = 1000,
+    durationMinute                  = 1000 * 60,
+    durationHour                    = 1000 * 60 * 60,
+    durationDay                     = 1000 * 60 * 60 * 24,
+    durationForever                 = 0x7FFFFFFF,
+    durationImmediate               = 0,
+};
 
 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);
+char* ConvertFileName( const char* orgfilename, const char* junk);
 
-#define fopen( a, b) fopen( ConvertFileName( a), b);
-/*
-inline float abs( float f)
-{
-if (f < 0)
-return -f;
-return f;
-}
 
-inline double abs( double f)
+#define fopen(a, b) fopen(ConvertFileName(a), b);
+
+#ifndef __MINGW32__
+inline float abs(float f)
 {
-if (f < 0)
-return -f;
-return f;
+    if (f < 0)
+        return -f;
+    return f;
 }
-*/
-inline long long abs( long long f)
+
+inline double abs(double f)
 {
-	if (f < 0)
-		return -f;
-	return f;
+    if (f < 0)
+        return -f;
+    return f;
 }
+#endif // __MINGW32__
+
+
+#endif
 #endif
-#endif
\ No newline at end of file