diff options
author | rubidium <rubidium@openttd.org> | 2009-07-14 16:43:45 +0000 |
---|---|---|
committer | rubidium <rubidium@openttd.org> | 2009-07-14 16:43:45 +0000 |
commit | e3c7a77b4066f00f3248e390184da874bd20d7ee (patch) | |
tree | 616b02702d4044f27e435ab5e0f5d826da92a171 /src/video/cocoa/wnd_quartz.mm | |
parent | 2b1c43f81f792a1aa28065c1fef4ea9cbad1f5a9 (diff) | |
download | openttd-e3c7a77b4066f00f3248e390184da874bd20d7ee.tar.xz |
(svn r16827) -Codechange: make OSX specific files include stdafx.h always as the first file. Also unify OSX specific stuff into osx_stdafx.h and remove unused includes.
Diffstat (limited to 'src/video/cocoa/wnd_quartz.mm')
-rw-r--r-- | src/video/cocoa/wnd_quartz.mm | 38 |
1 files changed, 12 insertions, 26 deletions
diff --git a/src/video/cocoa/wnd_quartz.mm b/src/video/cocoa/wnd_quartz.mm index aa09db1b0..3ad0c32b9 100644 --- a/src/video/cocoa/wnd_quartz.mm +++ b/src/video/cocoa/wnd_quartz.mm @@ -9,35 +9,16 @@ #ifdef WITH_COCOA #ifdef ENABLE_COCOA_QUARTZ -#include <AvailabilityMacros.h> +#include "../../stdafx.h" #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4 +#define Rect OTTDRect +#define Point OTTDPoint #import <Cocoa/Cocoa.h> -#import <sys/time.h> /* gettimeofday */ -#import <sys/param.h> /* for MAXPATHLEN */ -#import <unistd.h> - -/** - * Important notice regarding all modifications!!!!!!! - * There are certain limitations because the file is objective C++. - * gdb has limitations. - * C++ and objective C code can't be joined in all cases (classes stuff). - * Read http://developer.apple.com/releasenotes/Cocoa/Objective-C++.html for more information. - */ - - -/* Defined in stdbool.h */ -#ifndef __cplusplus -# ifndef __BEOS__ -# undef bool -# undef false -# undef true -# endif -#endif - +#undef Rect +#undef Point -#include "../../stdafx.h" #include "../../debug.h" #include "../../rev.h" #include "../../core/geometry_type.hpp" @@ -46,8 +27,13 @@ #include "../../gfx_func.h" #include "../../functions.h" -#undef Rect - +/** + * Important notice regarding all modifications!!!!!!! + * There are certain limitations because the file is objective C++. + * gdb has limitations. + * C++ and objective C code can't be joined in all cases (classes stuff). + * Read http://developer.apple.com/releasenotes/Cocoa/Objective-C++.html for more information. + */ class WindowQuartzSubdriver; |