On Wed, Aug 6, 2025 at 12:26 AM Tom Lane <t...@sss.pgh.pa.us> wrote:
> 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 > > This shouldn't complicate extensions' lives any further than > before; the rule still is "include ICU headers first > if you want their C++ symbols". > > BTW, I see that you applied ed26c4e25 only to master, but don't > we want to back-patch? cpluspluscheck is not just an exercise in a > vacuum, it's to ensure that C++-coded extensions don't have trouble > with our headers. I was thinking that it was run only when developing new features, not for backpatch-able bug fixes, but that's a flawed assumption. I'll remedy that soon along with the new symbols above, unless you beat me to it. -- John Naylor Amazon Web Services
