Cleanning up Sprite class. More can be done, but it's already prettier.

[lugaru.git] / Source / MacCompatibility.h

diff --git a/Source/MacCompatibility.h b/Source/MacCompatibility.h
index 95781f23160ea6c8c80008b4119b02538cef7682..1b6894001ffedf604aecaec76cd59625c8c68731 100644 (file)
--- a/Source/MacCompatibility.h
+++ b/Source/MacCompatibility.h
@@ -1,3 +1,24 @@
+/*
+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 _MACCOMPATIBLITY_H_
 #define _MACCOMPATIBLITY_H_
 
@@ -5,10 +26,15 @@
 
 #include <stdio.h>
 #include <float.h>
+#include <math.h>
 
-// stuff to make Mac code compatable with Windows
+// 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)
 #pragma warning(disable:4244)
@@ -18,6 +44,13 @@
 
 // disable warning about unreferenced local variables
 #pragma warning(disable:4101)
+#endif
+
+#ifndef __forceinline
+#  ifdef __GNUC__
+#    define __forceinline inline __attribute__((always_inline))
+#  endif
+#endif
 
 typedef bool Boolean;
 
@@ -63,36 +96,23 @@ enum
 
 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);
 }
-
-typedef unsigned int uintptr_t;
+#else
+#include <stdint.h>
+#endif
 
 
 // fix file names to use '/' instead of ':'
-char* ConvertFileName( const char* orgfilename);
+char* ConvertFileName( const char* orgfilename, const char *mode = "rb" );
 
-#define fopen( a, b) fopen( ConvertFileName( a), b);
-/*
-inline float abs( float f)
-{
-if (f < 0)
-return -f;
-return f;
-}
+#define fopen( a, b) fopen(ConvertFileName(a, b), b)
 
-inline double abs( double f)
-{
-if (f < 0)
-return -f;
-return f;
-}
-*/
-inline long long abs( long long f)
+__forceinline long long longlongabs( long long f)
 {
        if (f < 0)
                return -f;
@@ -101,3 +121,4 @@ inline long long abs( long long f)
 #endif
 #endif
 
+