miguel.horta/openttd-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source 
Conflicts:
	src/os/unix/unix.cpp
	src/widgets/dropdown.cpp
This commit is contained in:
Sergii Pylypenko
2014-08-19 19:21:47 +03:00
parent 9916f1e361 f1273275cc
commit 2603e6b5e3
115 changed files with 4741 additions and 2376 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/fontdetection.cpp
View File

@@ -396,7 +396,7 @@ FT_Error GetFontByFaceName(const char *font_name, FT_Face *face)
} else
#endif
{
#if (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5) && !__LP64__
#if (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5) && !defined(__LP64__)
/* This type was introduced with the 10.5 SDK. */
#if (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5)
#define ATSFSSpec FSSpec