dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r25474) -Fix [FS#5618]: OS X compilation failure

Browse Source
This commit is contained in:
rubidium
2013-06-26 15:02:16 +00:00
parent b0e63f55ba
commit fd1ee0560c
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/os/macosx/osx_stdafx.h
View File

@@ -44,6 +44,7 @@
#define WindowClass OTTDWindowClass #define WindowClass OTTDWindowClass
#define ScriptOrder OTTDScriptOrder #define ScriptOrder OTTDScriptOrder
#define Palette OTTDPalette #define Palette OTTDPalette
#define GlyphID OTTDGlyphID
#include <CoreServices/CoreServices.h> #include <CoreServices/CoreServices.h>
#include <ApplicationServices/ApplicationServices.h> #include <ApplicationServices/ApplicationServices.h>
@@ -53,6 +54,7 @@
#undef WindowClass #undef WindowClass
#undef ScriptOrder #undef ScriptOrder
#undef Palette #undef Palette
#undef GlyphID
/* remove the variables that CoreServices defines, but we define ourselves too */ /* remove the variables that CoreServices defines, but we define ourselves too */
#undef bool #undef bool