Patch #546194: Check constants individually. Fixes 534143 on OpenBSD.
Will backport to 2.2.
This commit is contained in:
parent
4f109c1cf9
commit
2ea2c9d1c3
|
@ -482,19 +482,36 @@ struct langinfo_constant{
|
||||||
LANGINFO(AM_STR),
|
LANGINFO(AM_STR),
|
||||||
LANGINFO(PM_STR),
|
LANGINFO(PM_STR),
|
||||||
|
|
||||||
/* The following constants are available only with XPG4. AIX 3.2. only has
|
/* The following constants are available only with XPG4, but...
|
||||||
CODESET. */
|
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
|
#ifdef CODESET
|
||||||
LANGINFO(CODESET),
|
LANGINFO(CODESET),
|
||||||
#endif
|
#endif
|
||||||
#ifdef T_FMT_AMPM
|
#ifdef T_FMT_AMPM
|
||||||
LANGINFO(T_FMT_AMPM),
|
LANGINFO(T_FMT_AMPM),
|
||||||
|
#endif
|
||||||
|
#ifdef ERA
|
||||||
LANGINFO(ERA),
|
LANGINFO(ERA),
|
||||||
|
#endif
|
||||||
|
#ifdef ERA_D_FMT
|
||||||
LANGINFO(ERA_D_FMT),
|
LANGINFO(ERA_D_FMT),
|
||||||
|
#endif
|
||||||
|
#ifdef ERA_D_T_FMT
|
||||||
LANGINFO(ERA_D_T_FMT),
|
LANGINFO(ERA_D_T_FMT),
|
||||||
|
#endif
|
||||||
|
#ifdef ERA_T_FMT
|
||||||
LANGINFO(ERA_T_FMT),
|
LANGINFO(ERA_T_FMT),
|
||||||
|
#endif
|
||||||
|
#ifdef ALT_DIGITS
|
||||||
LANGINFO(ALT_DIGITS),
|
LANGINFO(ALT_DIGITS),
|
||||||
|
#endif
|
||||||
|
#ifdef YESEXPR
|
||||||
LANGINFO(YESEXPR),
|
LANGINFO(YESEXPR),
|
||||||
|
#endif
|
||||||
|
#ifdef NOEXPR
|
||||||
LANGINFO(NOEXPR),
|
LANGINFO(NOEXPR),
|
||||||
#endif
|
#endif
|
||||||
#ifdef _DATE_FMT
|
#ifdef _DATE_FMT
|
||||||
|
|
Loading…
Reference in New Issue