X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FWinDefs.h;h=32c7945f8068104280683648ec8324f55ef1fba3;hb=c5dc3750efbc615b70917f19bb95cbd352cd00f6;hp=4cf515e6270abca56c6fe9eb871c083022bc6096;hpb=af283344ca70f7fbe9abd0d269511bc4ec3ff4bf;p=lugaru.git
diff --git a/Source/WinDefs.h b/Source/WinDefs.h
index 4cf515e..32c7945 100644
--- a/Source/WinDefs.h
+++ b/Source/WinDefs.h
@@ -1,22 +1,21 @@
/*
Copyright (C) 2003, 2010 - Wolfire Games
+Copyright (C) 2010-2016 - Lugaru contributors (see AUTHORS file)
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.
+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,
+Lugaru 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.
+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.
+along with Lugaru. If not, see .
*/
#ifndef _WINDEFS_H_
@@ -25,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include
-#include
+#include
// stuff to make Mac code compatable with Windows
@@ -40,12 +39,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
// disable warning about unreferenced local variables
#pragma warning(disable:4101)
-typedef bool Boolean;
-
-struct Point
-{
- short v;
- short h;
+struct Point {
+ short v;
+ short h;
};
typedef signed char SInt8;
@@ -55,22 +51,16 @@ typedef unsigned int UInt32;
#include "Random.h"
-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,
@@ -83,36 +73,21 @@ enum
Duration AbsoluteDeltaToDuration( AbsoluteTime& a, AbsoluteTime& b);
-
-inline bool isnormal( double x)
-{
- 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);
-
+#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)
{
- if (f < 0)
- return -f;
- return f;
+ if (f < 0)
+ return -f;
+ return f;
}
+#endif // __MINGW32__
#endif