Don't imply XPG4 constants from CODESET presence. Fixes #534153.
2.2.2 candiate.
diff --git a/Modules/_localemodule.c b/Modules/_localemodule.c
index cfbef9f..e72999c 100644
--- a/Modules/_localemodule.c
+++ b/Modules/_localemodule.c
@@ -478,9 +478,12 @@
LANGINFO(AM_STR),
LANGINFO(PM_STR),
+ /* The following constants are available only with XPG4. AIX 3.2. only has
+ CODESET. */
#ifdef CODESET
- /* The following constants are available only with XPG4. */
LANGINFO(CODESET),
+#endif
+#ifdef T_FMT_AMPM
LANGINFO(T_FMT_AMPM),
LANGINFO(ERA),
LANGINFO(ERA_D_FMT),