From: Martin v. Löwis <martin@v.loewis.de>
Date: Wed, 27 Mar 2002 12:15:57 +0000 (+0000)
Subject: Don't imply XPG4 constants from CODESET presence. Fixes #534153.
X-Git-Tag: v2.3c1~6309
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=496f9e41ef01965caf747533acee3611871067b2;p=thirdparty%2FPython%2Fcpython.git

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 cfbef9f432dd..e72999c471d4 100644
--- a/Modules/_localemodule.c
+++ b/Modules/_localemodule.c
@@ -478,9 +478,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),