X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FMacCompatibility.h;h=92f16b295435b6394db0851c6165c78d0ad9aaee;hb=5310d6ffd89fd8b981b273b332a232b70b4ce7ad;hp=3a99c52a052925f9dfc90c7036950365f5aca3ee;hpb=d4fc2f86e43ce4e3e00ee033203f664a4a3d20a5;p=lugaru.git diff --git a/Source/MacCompatibility.h b/Source/MacCompatibility.h index 3a99c52..92f16b2 100644 --- a/Source/MacCompatibility.h +++ b/Source/MacCompatibility.h @@ -10,7 +10,7 @@ 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. +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. @@ -55,10 +55,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. typedef bool Boolean; -struct Point -{ - short v; - short h; +struct Point { + short v; + short h; }; typedef signed char SInt8; @@ -72,35 +71,33 @@ 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; +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 @@ -111,27 +108,7 @@ inline bool isnormal( double x) char* ConvertFileName( const char* orgfilename, const char *mode = "rb" ); #define fopen( a, b) fopen(ConvertFileName(a, b), 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