diff options
| author | John Naylor | 2025-08-07 10:10:52 +0000 |
|---|---|---|
| committer | John Naylor | 2025-08-07 10:10:52 +0000 |
| commit | 90bfae9f93e7eb0328cc8288bd09234315997ec8 (patch) | |
| tree | 4bde9f90e32f20bf4a02f458cfa54996a0e4f1c8 /src | |
| parent | 1beda2c3cf5842c37edd7081468a703052c6d0f0 (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 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/include/utils/pg_locale.h b/src/include/utils/pg_locale.h index 931f5b3b880..2b072cafb4d 100644 --- a/src/include/utils/pg_locale.h +++ b/src/include/utils/pg_locale.h @@ -18,6 +18,8 @@ /* 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 |