(svn r15892) -Codechange: [OSX] some type fixes so OpenTTD likes more of the 3.1.x Xcodes.
This commit is contained in:
@@ -5,7 +5,18 @@
|
||||
#ifndef MACOS_STDAFX_H
|
||||
#define MACOS_STDAFX_H
|
||||
|
||||
/* __LP64__ only exists in 10.5 and higher */
|
||||
#if defined(__APPLE__) && !defined(__LP64__)
|
||||
# define __LP64__ 0
|
||||
#endif
|
||||
|
||||
/* Check for mismatching 'architectures' */
|
||||
#if (__LP64__ && !defined(_SQ64)) || (!__LP64__ && defined(_SQ64))
|
||||
# error "Compiling 64 bits without _SQ64 set! (or vice versa)"
|
||||
#endif
|
||||
|
||||
#include <CoreServices/CoreServices.h>
|
||||
|
||||
/* remove the variables that CoreServices defines, but we define ourselves too */
|
||||
#undef bool
|
||||
#undef false
|
||||
@@ -16,4 +27,15 @@
|
||||
|
||||
#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 */
|
||||
|
Reference in New Issue
Block a user