Files
@ r17053:d1bd348513e5
Branch filter:
Location: cpp/openttd-patchpack/source/src/os/macosx/osx_stdafx.h - annotation
r17053:d1bd348513e5
2.2 KiB
text/x-c
(svn r21800) -Fix [FS#3569]: under certain circumstances one could crash a competitor's train; take the lazy non-future proof version of the fix from the 1.0 branch as fixing the real bug is significantly more complex and might even break some backwards compatability if not done perfectly
r5475:3f5cd13d1b63 r5475:3f5cd13d1b63 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r9111:983de9c5a848 r9111:983de9c5a848 r5475:3f5cd13d1b63 r5475:3f5cd13d1b63 r5475:3f5cd13d1b63 r12387:de3949de7769 r12387:de3949de7769 r12387:de3949de7769 r11541:aaf650313134 r11541:aaf650313134 r11541:aaf650313134 r11782:7b1b84af086c r11541:aaf650313134 r13189:ab2ccc525850 r13189:ab2ccc525850 r13189:ab2ccc525850 r13189:ab2ccc525850 r13189:ab2ccc525850 r13189:ab2ccc525850 r11526:ee46e584d4c5 r11526:ee46e584d4c5 r11526:ee46e584d4c5 r11526:ee46e584d4c5 r11526:ee46e584d4c5 r11526:ee46e584d4c5 r13248:d896229ed312 r11526:ee46e584d4c5 r11526:ee46e584d4c5 r11526:ee46e584d4c5 r12386:d4d6ee913899 r12386:d4d6ee913899 r12386:d4d6ee913899 r12386:d4d6ee913899 r12386:d4d6ee913899 r12386:d4d6ee913899 r12386:d4d6ee913899 r5475:3f5cd13d1b63 r11526:ee46e584d4c5 r12386:d4d6ee913899 r12386:d4d6ee913899 r12386:d4d6ee913899 r12386:d4d6ee913899 r11363:6906c490a00e r5475:3f5cd13d1b63 r5475:3f5cd13d1b63 r5475:3f5cd13d1b63 r5475:3f5cd13d1b63 r5475:3f5cd13d1b63 r12386:d4d6ee913899 r5475:3f5cd13d1b63 r5475:3f5cd13d1b63 r5475:3f5cd13d1b63 r11526:ee46e584d4c5 r11526:ee46e584d4c5 r11526:ee46e584d4c5 r11526:ee46e584d4c5 r11526:ee46e584d4c5 r11526:ee46e584d4c5 r11526:ee46e584d4c5 r11526:ee46e584d4c5 r11526:ee46e584d4c5 r11526:ee46e584d4c5 r11526:ee46e584d4c5 r5475:3f5cd13d1b63 | /* $Id$ */
/*
* This file is part of OpenTTD.
* OpenTTD 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, version 2.
* OpenTTD 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 OpenTTD. If not, see <http://www.gnu.org/licenses/>.
*/
/** @file osx_stdafx.h OSX is different on some places. */
#ifndef MACOS_STDAFX_H
#define MACOS_STDAFX_H
#define __STDC_LIMIT_MACROS
#include <stdint.h>
/* We need to include this first as that "depends" on the compiler's setting
* of __LP64__. So before we define __LP64__ so it can be used. */
#include <sys/cdefs.h>
#include <unistd.h>
/* Some gcc versions include assert.h via this header. As this would interfere
* with our own assert redefinition, include this header first. */
#if defined(__GNUC__) && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3))
# include <debug/debug.h>
#endif
/* __LP64__ only exists in 10.5 and higher */
#if defined(__APPLE__) && !defined(__LP64__)
# define __LP64__ 0
#endif
/* Check for mismatching 'architectures' */
#if !defined(STRGEN) && ((__LP64__ && !defined(_SQ64)) || (!__LP64__ && defined(_SQ64)))
# error "Compiling 64 bits without _SQ64 set! (or vice versa)"
#endif
#include <AvailabilityMacros.h>
/* Name conflict */
#define Rect OTTDRect
#define Point OTTDPoint
#define WindowClass OTTDWindowClass
#include <CoreServices/CoreServices.h>
#undef Rect
#undef Point
#undef WindowClass
/* remove the variables that CoreServices defines, but we define ourselves too */
#undef bool
#undef false
#undef true
/* Name conflict */
#define GetTime OTTD_GetTime
#define SL_ERROR OSX_SL_ERROR
/* NSInteger and NSUInteger are part of 10.5 and higher. */
#ifndef NSInteger
#if __LP64__
typedef long NSInteger;
typedef unsigned long NSUInteger;
#else
typedef int NSInteger;
typedef unsigned int NSUInteger;
#endif /* __LP64__ */
#endif /* NSInteger */
#endif /* MACOS_STDAFX_H */
|