From: John Naylor Date: Thu, 7 Aug 2025 10:15:09 +0000 (+0700) Subject: Update ICU C++ API symbols X-Git-Tag: REL_15_14~18 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=baacfb9e609cbd7b210225fa25bfc94e518aaabf;p=thirdparty%2Fpostgresql.git Update ICU C++ API symbols 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 ed26c4e25a4 to all supported versions. Reported-by: Tom Lane Discussion: https://postgr.es/m/1115793.1754414782%40sss.pgh.pa.us Backpatch-through: 13 --- diff --git a/.cirrus.tasks.yml b/.cirrus.tasks.yml index 995ae7cefb9..3a5cdebf398 100644 --- a/.cirrus.tasks.yml +++ b/.cirrus.tasks.yml @@ -581,8 +581,6 @@ task: # - Don't use ccache, the files are uncacheable, polluting ccache's # cache # - 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 # - XXX: the -Wno-register avoids verbose warnings: # https://postgr.es/m/20220308181837.aun3tdtdvao4vb7o%40alap3.anarazel.de ### @@ -590,7 +588,6 @@ task: headers_headerscheck_script: | time ./configure \ ${LINUX_CONFIGURE_FEATURES} \ - --without-icu \ --quiet \ CC="gcc" CXX"=g++" CLANG="clang" make -s -j${BUILD_JOBS} clean diff --git a/src/include/utils/pg_locale.h b/src/include/utils/pg_locale.h index de7c5e30d2d..fef94bc13bc 100644 --- a/src/include/utils/pg_locale.h +++ b/src/include/utils/pg_locale.h @@ -16,6 +16,11 @@ #include #endif #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 #endif