[Python-checkins] python/dist/src/Modules _localemodule.c,2.25.6.2,2.25.6.3

[loewis@sourceforge.net]

Update of /cvsroot/python/python/dist/src/Modules
In directory usw-pr-cvs1:/tmp/cvs-serv25168

Modified Files:
      Tag: release22-maint
	_localemodule.c 
Log Message:
Patch #546194: Check constants individually. Fixes 534143 on OpenBSD.


Index: _localemodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/_localemodule.c,v
retrieving revision 2.25.6.2
retrieving revision 2.25.6.3
diff -C2 -d -r2.25.6.2 -r2.25.6.3
*** _localemodule.c	5 Apr 2002 15:26:55 -0000	2.25.6.2
--- _localemodule.c	19 Apr 2002 21:06:13 -0000	2.25.6.3
***************
*** 485,490 ****
      LANGINFO(PM_STR),
  
!     /* The following constants are available only with XPG4. AIX 3.2. only has
!        CODESET. */
  #ifdef CODESET
      LANGINFO(CODESET),
--- 485,493 ----
      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),
***************
*** 492,501 ****
--- 495,518 ----
  #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