diff options
| author | rubidium <rubidium@openttd.org> | 2015-08-09 12:33:27 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2015-08-09 12:33:27 +0000 |
| commit | 69fac508c386f660be4428a1e58da30ec0acd9a1 (patch) | |
| tree | 7a0fd9a382b0e7dec5966bc7e50f249021d9f91a /src/string.cpp | |
| parent | bdf090b406e87ff2d0a3f3c5b6dc92b4c232dc3c (diff) | |
| download | openttd-69fac508c386f660be4428a1e58da30ec0acd9a1.tar.xz | |
(svn r27367) -Codechange: make a distinction between the layouting part of ICU (lx) or the sorting/collation part of ICU (i18n)
Diffstat (limited to 'src/string.cpp')
| -rw-r--r-- | src/string.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/string.cpp b/src/string.cpp index 6bc9319c1..377fb7f98 100644 --- a/src/string.cpp +++ b/src/string.cpp @@ -25,12 +25,12 @@ #include <errno.h> // required by vsnprintf implementation for MSVC #endif -#ifdef WITH_ICU +#ifdef WITH_ICU_SORT /* Required by strnatcmp. */ #include <unicode/ustring.h> #include "language.h" #include "gfx_func.h" -#endif /* WITH_ICU */ +#endif /* WITH_ICU_SORT */ /* 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. */ @@ -572,7 +572,7 @@ int strnatcmp(const char *s1, const char *s2, bool ignore_garbage_at_front) s1 = SkipGarbage(s1); s2 = SkipGarbage(s2); } -#ifdef WITH_ICU +#ifdef WITH_ICU_SORT if (_current_collator != NULL) { UErrorCode status = U_ZERO_ERROR; int result; @@ -592,13 +592,13 @@ int strnatcmp(const char *s1, const char *s2, bool ignore_garbage_at_front) if (U_SUCCESS(status)) return result; } -#endif /* WITH_ICU */ +#endif /* WITH_ICU_SORT */ /* Do a normal comparison if ICU is missing or if we cannot create a collator. */ return strcasecmp(s1, s2); } -#ifdef WITH_ICU +#ifdef WITH_ICU_SORT #include <unicode/utext.h> #include <unicode/brkiter.h> |