diff options
Diffstat (limited to 'src/backend/utils/adt')
| -rw-r--r-- | src/backend/utils/adt/formatting.c | 6 | ||||
| -rw-r--r-- | src/backend/utils/adt/pg_locale.c | 5 |
2 files changed, 1 insertions, 10 deletions
diff --git a/src/backend/utils/adt/formatting.c b/src/backend/utils/adt/formatting.c index 2bf484cda31..7877af2d6be 100644 --- a/src/backend/utils/adt/formatting.c +++ b/src/backend/utils/adt/formatting.c @@ -1565,7 +1565,6 @@ str_tolower(const char *buff, size_t nbytes, Oid collid) else #endif { -#ifdef USE_WIDE_UPPER_LOWER if (pg_database_encoding_max_length() > 1) { wchar_t *workspace; @@ -1604,7 +1603,6 @@ str_tolower(const char *buff, size_t nbytes, Oid collid) pfree(workspace); } else -#endif /* USE_WIDE_UPPER_LOWER */ { char *p; @@ -1689,7 +1687,6 @@ str_toupper(const char *buff, size_t nbytes, Oid collid) else #endif { -#ifdef USE_WIDE_UPPER_LOWER if (pg_database_encoding_max_length() > 1) { wchar_t *workspace; @@ -1728,7 +1725,6 @@ str_toupper(const char *buff, size_t nbytes, Oid collid) pfree(workspace); } else -#endif /* USE_WIDE_UPPER_LOWER */ { char *p; @@ -1814,7 +1810,6 @@ str_initcap(const char *buff, size_t nbytes, Oid collid) else #endif { -#ifdef USE_WIDE_UPPER_LOWER if (pg_database_encoding_max_length() > 1) { wchar_t *workspace; @@ -1865,7 +1860,6 @@ str_initcap(const char *buff, size_t nbytes, Oid collid) pfree(workspace); } else -#endif /* USE_WIDE_UPPER_LOWER */ { char *p; diff --git a/src/backend/utils/adt/pg_locale.c b/src/backend/utils/adt/pg_locale.c index 3d3d8aa4b65..5ad75efb7a2 100644 --- a/src/backend/utils/adt/pg_locale.c +++ b/src/backend/utils/adt/pg_locale.c @@ -1587,6 +1587,7 @@ icu_from_uchar(char **result, const UChar *buff_uchar, int32_t len_uchar) return len_result; } + #endif /* USE_ICU */ /* @@ -1594,8 +1595,6 @@ icu_from_uchar(char **result, const UChar *buff_uchar, int32_t len_uchar) * Therefore we keep them here rather than with the mbutils code. */ -#ifdef USE_WIDE_UPPER_LOWER - /* * wchar2char --- convert wide characters to multibyte format * @@ -1762,5 +1761,3 @@ char2wchar(wchar_t *to, size_t tolen, const char *from, size_t fromlen, return result; } - -#endif /* USE_WIDE_UPPER_LOWER */ |