From eeed3a7613d375f66781f53b42e03729a4ca1c33 Mon Sep 17 00:00:00 2001
From: Marcus Calhoun-Lopez <mcalhoun@macports.org>
Date: Thu, 4 Jun 2020 14:49:40 +0200
Subject: [PATCH] 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.
---
 src/string.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/string.cpp b/src/string.cpp
index bec7c8e926..d0de261e53 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"