summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2002-03-27 12:15:57 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2002-03-27 12:15:57 (GMT)
commit496f9e41ef01965caf747533acee3611871067b2 (patch)
tree9dc7ea4a966a7d597e2e51f1b1d391d5f1de28d5
parent1d46e40f58b21dd6c30e21a841d65e9bcbc899b1 (diff)
downloadcpython-496f9e41ef01965caf747533acee3611871067b2.zip
cpython-496f9e41ef01965caf747533acee3611871067b2.tar.gz
cpython-496f9e41ef01965caf747533acee3611871067b2.tar.bz2
Don't imply XPG4 constants from CODESET presence. Fixes #534153.
2.2.2 candiate.
-rw-r--r--Modules/_localemodule.c5
1 files changed, 4 insertions, 1 deletions
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 @@ 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),