X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FMacCompatibility.h;h=26b0b60827453f30c2711c2f73a3b9830c9a8cee;hb=b84825978803615f45a9f128232e62431042aec0;hp=d1096ae609b28c5f058b74d249059a4f686164ba;hpb=d9bff07d8752bf235679170c94faf3501ccd7627;p=lugaru.git diff --git a/Source/MacCompatibility.h b/Source/MacCompatibility.h index d1096ae..26b0b60 100644 --- a/Source/MacCompatibility.h +++ b/Source/MacCompatibility.h @@ -1,14 +1,36 @@ +/* +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 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 Lugaru. If not, see . +*/ + #ifndef _MACCOMPATIBLITY_H_ #define _MACCOMPATIBLITY_H_ -#if !PLATFORM_MACOSX - #include #include #include // stuff to make Mac code compatable with Windows/Linux/etc +#if defined(WIN32) && !defined(strcasecmp) +#define strcasecmp(a,b) stricmp(a,b) +#endif + #ifdef _MSC_VER // disable warnings about double to float conversions #pragma warning(disable:4305) @@ -27,87 +49,49 @@ # endif #endif -typedef bool Boolean; - - -struct Point -{ - short v; - short h; +struct Point { + short v; + short h; }; typedef signed char SInt8; typedef unsigned int UInt32; -#include "Random.h" - - -void CopyCStringToPascal( const char* src, unsigned char dst[256]); -void CopyPascalStringToC( const unsigned char* src, char* dst); - +#include "Math/Random.h" -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); #ifdef _MSC_VER 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); } +#else +#include #endif -typedef unsigned int uintptr_t; - - -// fix file names to use '/' instead of ':' -char* ConvertFileName( const char* orgfilename); - -#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) -{ -if (f < 0) -return -f; -return f; -} -*/ -__forceinline long long longlongabs( long long f) -{ - if (f < 0) - return -f; - return f; -} -#endif #endif