Switched all data access to the new methods

[lugaru.git] / Source / MacCompatibility.h

diff --git a/Source/MacCompatibility.h b/Source/MacCompatibility.h
index 1b6894001ffedf604aecaec76cd59625c8c68731..5d6f9550aa694d07784fa51ada4dad751217a5a1 100644 (file)
--- a/Source/MacCompatibility.h
+++ b/Source/MacCompatibility.h
@@ -1,29 +1,26 @@
 /*
 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 <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _MACCOMPATIBLITY_H_
 #define _MACCOMPATIBLITY_H_
 
-#if !PLATFORM_MACOSX
-
 #include <stdio.h>
 #include <float.h>
 #include <math.h>
@@ -52,13 +49,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #  endif
 #endif
 
-typedef bool Boolean;
-
-
-struct Point
-{
-       short v;
-       short h;
+struct Point {
+    short v;
+    short h;
 };
 
 typedef signed char SInt8;
@@ -67,58 +60,38 @@ typedef unsigned int UInt32;
 
 #include "Random.h"
 
+typedef struct AbsoluteTime {
+    unsigned long   hi;
+    unsigned long   lo;
+} AbsoluteTime;
 
-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; 
-
-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 <stdint.h>
 #endif
 
-
-// fix file names to use '/' instead of ':'
-char* ConvertFileName( const char* orgfilename, const char *mode = "rb" );
-
-#define fopen( a, b) fopen(ConvertFileName(a, b), b)
-
-__forceinline long long longlongabs( long long f)
-{
-       if (f < 0)
-               return -f;
-       return f;
-}
-#endif
 #endif