database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-10-29 22:49:41 +03:00
Code Activity

Update ICU C++ API symbols

Browse Source 
Recent ICU versions have added U_SHOW_CPLUSPLUS_HEADER_API, and we need
to set this to zero as well to hide the ICU C++ APIs from pg_locale.h

Per discussion, we want cpluspluscheck to work cleanly in backbranches,
so backpatch both this and its predecessor commit ed26c4e25a to all
supported versions.

Reported-by: Tom Lane <tgl@sss.pgh.pa.us>
Discussion: https://postgr.es/m/1115793.1754414782%40sss.pgh.pa.us
Backpatch-through: 13
This commit is contained in:
John Naylor
2025-08-07 17:13:55 +07:00
parent 930e1faec5
commit 21ae8fc5fd
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.cirrus.tasks.yml
View File

@@ -777,14 +777,11 @@ task:
# - Don't use ccache, the files are uncacheable, polluting ccache's # - Don't use ccache, the files are uncacheable, polluting ccache's
# cache # cache
# - Use -fmax-errors, as particularly cpluspluscheck can be very verbose # - Use -fmax-errors, as particularly cpluspluscheck can be very verbose
# - XXX have to disable ICU to avoid errors:
# https://postgr.es/m/20220323002024.f2g6tivduzrktgfa%40alap3.anarazel.de
### ###
always: always:
headers_headerscheck_script: | headers_headerscheck_script: |
time ./configure \ time ./configure \
${LINUX_CONFIGURE_FEATURES} \ ${LINUX_CONFIGURE_FEATURES} \
--without-icu \
--quiet \ --quiet \
CC="gcc" CXX"=g++" CLANG="clang" CC="gcc" CXX"=g++" CLANG="clang"
make -s -j${BUILD_JOBS} clean make -s -j${BUILD_JOBS} clean

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

@@ -16,6 +16,11 @@
#include <xlocale.h> #include <xlocale.h>
#endif #endif
#ifdef USE_ICU #ifdef USE_ICU
/* only include the C APIs, to avoid errors in cpluspluscheck */
#undef U_SHOW_CPLUSPLUS_API
#define U_SHOW_CPLUSPLUS_API 0
#undef U_SHOW_CPLUSPLUS_HEADER_API
#define U_SHOW_CPLUSPLUS_HEADER_API 0
#include <unicode/ucol.h> #include <unicode/ucol.h>
#endif #endif