backport loewis' checkin of

    revision 2.28 of _localemodule.c

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 c617bfb47f9bb08cbad70db3dd1ee2b92702957f..6073fc7325db9ff01b0b069e4a249161873eea35 100644 (file)
--- a/Modules/_localemodule.c
+++ b/Modules/_localemodule.c
@@ -484,9 +484,12 @@ struct langinfo_constant{
     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),