From: Michael W. Hudson <mwh@python.net>
Date: Fri, 5 Apr 2002 15:26:55 +0000 (+0000)
Subject: backport loewis' checkin of
X-Git-Tag: v2.2.1~18
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=044038af4b30a1056eec9eeaf6d87c88ad8e85c8;p=thirdparty%2FPython%2Fcpython.git

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 c617bfb47f9b..6073fc7325db 100644
--- 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),