1berry/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move check for ucol_strcollUTF8 to pg_locale_icu.c

Browse Source 
The result of the check is only used by pg_locale_icu.c.

Author: Andreas Karlsson
Discussion: https://postgr.es/m/4548a168-62cd-457b-8d06-9ba7b985c477@proxel.se
This commit is contained in:
Jeff Davis 2024-12-03 11:32:14 -08:00
parent 32a7deb2a0
commit 7167e05fc7
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/backend/utils/adt/pg_locale_icu.c
View File

@ -14,6 +14,18 @@
#ifdef USE_ICU #ifdef USE_ICU
#include <unicode/ucnv.h> #include <unicode/ucnv.h>
#include <unicode/ustring.h> #include <unicode/ustring.h>
/*
* ucol_strcollUTF8() was introduced in ICU 50, but it is buggy before ICU 53.
* (see
* <https://www.postgresql.org/message-id/flat/f1438ec6-22aa-4029-9a3b-26f79d330e72%40manitou-mail.org>)
*/
#if U_ICU_VERSION_MAJOR_NUM >= 53
#define HAVE_UCOL_STRCOLLUTF8 1
#else
#undef HAVE_UCOL_STRCOLLUTF8
#endif
#endif #endif
#include "access/htup_details.h" #include "access/htup_details.h"

13
src/include/utils/pg_locale.h
View File

@ -16,19 +16,6 @@
#include <unicode/ucol.h> #include <unicode/ucol.h>
#endif #endif
#ifdef USE_ICU
/*
* ucol_strcollUTF8() was introduced in ICU 50, but it is buggy before ICU 53.
* (see
* <https://www.postgresql.org/message-id/flat/f1438ec6-22aa-4029-9a3b-26f79d330e72%40manitou-mail.org>)
*/
#if U_ICU_VERSION_MAJOR_NUM >= 53
#define HAVE_UCOL_STRCOLLUTF8 1
#else
#undef HAVE_UCOL_STRCOLLUTF8
#endif
#endif
/* use for libc locale names */ /* use for libc locale names */
#define LOCALE_NAME_BUFLEN 128 #define LOCALE_NAME_BUFLEN 128