[Python-checkins] python/dist/src/Modules _localemodule.c,2.29,2.30
loewis@sourceforge.net
loewis@sourceforge.net
2002年4月19日 14:04:44 -0700
Update of /cvsroot/python/python/dist/src/Modules
In directory usw-pr-cvs1:/tmp/cvs-serv23809
Modified Files:
_localemodule.c
Log Message:
Patch #546194: Check constants individually. Fixes 534143 on OpenBSD.
Will backport to 2.2.
Index: _localemodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/_localemodule.c,v
retrieving revision 2.29
retrieving revision 2.30
diff -C2 -d -r2.29 -r2.30
*** _localemodule.c 27 Mar 2002 18:49:02 -0000 2.29
--- _localemodule.c 19 Apr 2002 21:04:41 -0000 2.30
***************
*** 483,488 ****
LANGINFO(PM_STR),
! /* The following constants are available only with XPG4. AIX 3.2. only has
! CODESET. */
#ifdef CODESET
LANGINFO(CODESET),
--- 483,491 ----
LANGINFO(PM_STR),
! /* 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),
***************
*** 490,499 ****
--- 493,516 ----
#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