mirror of
https://github.com/postgres/postgres.git
synced 2025-08-18 12:22:09 +03:00
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 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:
@@ -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
|
||||
|
||||
|
Reference in New Issue
Block a user