mirror/OpenTTD
1
0
Fork 1
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-08-21 05:29:11 +00:00
Code Issues Activity

Fix: unbreak building with ICU on macOS

Browse Source 
A symbol clash breaks building ICU on macOS, and although it isn't
necessary, it might as well be possible.
This commit is contained in:
Marcus Calhoun-Lopez
2020-06-04 14:49:40 +02:00
committed by Charles Pigott
parent 211735de3a
commit b7fa118069
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/string.cpp
View File

@@ -31,10 +31,6 @@
#include "os/windows/string_uniscribe.h"
#endif
#if defined(WITH_COCOA)
#include "os/macosx/string_osx.h"
#endif
#ifdef WITH_ICU_I18N
/* Required by strnatcmp. */
#include <unicode/ustring.h>
@@ -42,6 +38,10 @@
#include "gfx_func.h"
#endif /* WITH_ICU_I18N */
#if defined(WITH_COCOA)
#include "os/macosx/string_osx.h"
#endif
/* The function vsnprintf is used internally to perform the required formatting
* tasks. As such this one must be allowed, and makes sure it's terminated. */
#include "safeguards.h"