X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FMacCompatibility.h;h=8c179dbce3558365319c650e9d6b2fb645ff857d;hb=2e284d5574d29547f984cd625a76ef6266050abf;hp=3717ebaea1b57d71f36bef14a2625474fc2828dc;hpb=36cc3af3e5074215817ddee16defde754e2ad67f;p=lugaru.git

diff --git a/Source/MacCompatibility.h b/Source/MacCompatibility.h
index 3717eba..8c179db 100644
--- 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_
 
@@ -21,11 +42,12 @@
 #pragma warning(disable:4101)
 #endif
 
-#ifdef __GNUC__
-#define __forceinline inline __attribute__((always_inline))
+#ifndef __forceinline
+#  ifdef __GNUC__
+#    define __forceinline inline __attribute__((always_inline))
+#  endif
 #endif
 
-
 typedef bool Boolean;
 
 
@@ -76,15 +98,15 @@ inline bool isnormal( double x)
 	int ret = _fpclass( x);
 	return (ret == _FPCLASS_NN || ret == _FPCLASS_PN);
 }
+#else
+#include <stdint.h>
 #endif
 
-typedef unsigned int uintptr_t;
-
 
 // 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);
+#define fopen( a, b) fopen(ConvertFileName(a, b), b)
 /*
 inline float abs( float f)
 {