From 2ea2c9d1c3e74012f61e22246acdce3bfddef9d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Fri, 19 Apr 2002 21:04:41 +0000
Subject: [PATCH] Patch #546194: Check constants individually. Fixes 534143 on
 OpenBSD. Will backport to 2.2.

---
 Modules/_localemodule.c | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/Modules/_localemodule.c b/Modules/_localemodule.c
index 58d349bae73..e1f95a1a7d1 100644
--- a/Modules/_localemodule.c
+++ b/Modules/_localemodule.c
@@ -482,19 +482,36 @@ struct langinfo_constant{
     LANGINFO(AM_STR),
     LANGINFO(PM_STR),
 
-    /* The following constants are available only with XPG4. AIX 3.2. only has
-       CODESET. */
+    /* The following constants are available only with XPG4, but...
+       AIX 3.2. only has CODESET.
+       OpenBSD doesn't have CODESET but has T_FMT_AMPM, and doesn't have
+       a few of the others.
+       Solution: ifdef-test them all. */
 #ifdef CODESET
     LANGINFO(CODESET),
 #endif
 #ifdef T_FMT_AMPM
     LANGINFO(T_FMT_AMPM),
+#endif
+#ifdef ERA
     LANGINFO(ERA),
+#endif
+#ifdef ERA_D_FMT
     LANGINFO(ERA_D_FMT),
+#endif
+#ifdef ERA_D_T_FMT
     LANGINFO(ERA_D_T_FMT),
+#endif
+#ifdef ERA_T_FMT
     LANGINFO(ERA_T_FMT),
+#endif
+#ifdef ALT_DIGITS
     LANGINFO(ALT_DIGITS),
+#endif
+#ifdef YESEXPR
     LANGINFO(YESEXPR),
+#endif
+#ifdef NOEXPR
     LANGINFO(NOEXPR),
 #endif
 #ifdef _DATE_FMT