summaryrefslogtreecommitdiff
path: root/src/crashlog.cpp
diff options
context:
space:
mode:
authorPatric Stout <truebrain@openttd.org>2019-03-10 16:43:59 +0100
committerPatric Stout <truebrain@openttd.org>2019-03-11 10:16:00 +0100
commit52d7e7d45e0a2a6033942602ed9fdec821a7d2af (patch)
tree4db1138219b406c775dfad6e85432209ce004b92 /src/crashlog.cpp
parent7adae09897c6f17a60de9468e9e11d166ff52278 (diff)
downloadopenttd-52d7e7d45e0a2a6033942602ed9fdec821a7d2af.tar.xz
Codechange: ICU_LAYOUT is in reality ICU_LX (according to their CMake files)
By naming it in a different way, things get a bit confusing. Especially if we are switching to CMake, which autodetects these things, we need to use the name the authors of ICU gave it; not our interpertation of that name.
Diffstat (limited to 'src/crashlog.cpp')
-rw-r--r--src/crashlog.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/crashlog.cpp b/src/crashlog.cpp
index 8fbc4d3ce..bf522d96c 100644
--- a/src/crashlog.cpp
+++ b/src/crashlog.cpp
@@ -52,9 +52,9 @@
# include <ft2build.h>
# include FT_FREETYPE_H
#endif /* WITH_FREETYPE */
-#if defined(WITH_ICU_LAYOUT) || defined(WITH_ICU_SORT)
+#if defined(WITH_ICU_LX) || defined(WITH_ICU_SORT)
# include <unicode/uversion.h>
-#endif /* WITH_ICU_SORT || WITH_ICU_LAYOUT */
+#endif /* WITH_ICU_LX || WITH_ICU_SORT */
#ifdef WITH_LIBLZMA
# include <lzma.h>
#endif
@@ -240,7 +240,7 @@ char *CrashLog::LogLibraries(char *buffer, const char *last) const
buffer += seprintf(buffer, last, " FreeType: %d.%d.%d\n", major, minor, patch);
#endif /* WITH_FREETYPE */
-#if defined(WITH_ICU_LAYOUT) || defined(WITH_ICU_SORT)
+#if defined(WITH_ICU_LX) || defined(WITH_ICU_SORT)
/* 4 times 0-255, separated by dots (.) and a trailing '\0' */
char buf[4 * 3 + 3 + 1];
UVersionInfo ver;
@@ -249,10 +249,10 @@ char *CrashLog::LogLibraries(char *buffer, const char *last) const
#ifdef WITH_ICU_SORT
buffer += seprintf(buffer, last, " ICU i18n: %s\n", buf);
#endif
-#ifdef WITH_ICU_LAYOUT
+#ifdef WITH_ICU_LX
buffer += seprintf(buffer, last, " ICU lx: %s\n", buf);
#endif
-#endif /* WITH_ICU_SORT || WITH_ICU_LAYOUT */
+#endif /* WITH_ICU_LX || WITH_ICU_SORT */
#ifdef WITH_LIBLZMA
buffer += seprintf(buffer, last, " LZMA: %s\n", lzma_version_string());