diff options
| author | John Naylor <john.naylor@postgresql.org> | 2025-08-07 17:15:09 +0700 |
|---|---|---|
| committer | John Naylor <john.naylor@postgresql.org> | 2025-08-07 17:15:09 +0700 |
| commit | baacfb9e609cbd7b210225fa25bfc94e518aaabf (patch) | |
| tree | 290f54d3069798ed27bce49fbed599129bae3296 /src | |
| parent | 63c79a6fc23f0cd1220524fe120e7942b90f53bf (diff) | |
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 <tgl@sss.pgh.pa.us>
Discussion: https://postgr.es/m/1115793.1754414782%40sss.pgh.pa.us
Backpatch-through: 13
Diffstat (limited to 'src')
| -rw-r--r-- | src/include/utils/pg_locale.h | 5 |
1 files changed, 5 insertions, 0 deletions
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 <xlocale.h> #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 <unicode/ucol.h> #endif |