summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcus Calhoun-Lopez <mcalhoun@macports.org>2020-06-04 14:49:40 +0200
committerCharles Pigott <charlespigott@googlemail.com>2020-06-05 14:47:33 +0100
commiteeed3a7613d375f66781f53b42e03729a4ca1c33 (patch)
tree831fd0718e11024a1114b59819ea843d53bebe3c
parent937b3665463fb9e5155199a9675e5e43c8760bbf (diff)
downloadopenttd-eeed3a7613d375f66781f53b42e03729a4ca1c33.tar.xz
Fix: unbreak building with ICU on macOS
A symbol clash breaks building ICU on macOS, and although it isn't necessary, it might as well be possible.
-rw-r--r--src/string.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/string.cpp b/src/string.cpp
index bec7c8e92..d0de261e5 100644
--- a/src/string.cpp
+++ b/src/string.cpp
@@ -32,10 +32,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>
@@ -43,6 +39,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"