[Python-checkins] python/dist/src/Modules md5.h,2.7,2.7.26.1 _sre.c,2.77,2.77.6.1

[mwh@users.sourceforge.net]

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

Modified Files:
      Tag: release22-maint
	md5.h _sre.c 
Log Message:
Put Cray fixes on the branch, too.


Index: md5.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/md5.h,v
retrieving revision 2.7
retrieving revision 2.7.26.1
diff -C2 -d -r2.7 -r2.7.26.1
*** md5.h	26 Sep 2000 05:46:01 -0000	2.7
--- md5.h	31 Jul 2002 11:19:49 -0000	2.7.26.1
***************
*** 31,45 ****
  typedef unsigned char *POINTER;
  
- /* UINT2 defines a two byte word */
- typedef unsigned short int UINT2;
- 
  /* UINT4 defines a four byte word */
  #if SIZEOF_LONG == 4
  typedef unsigned long int UINT4;
! #else
! #if INT_MAX == 2147483647
  typedef unsigned int UINT4;
! #endif
! /* Too bad if neither is; pyport.h would need to be fixed. */
  #endif
  
--- 31,43 ----
  typedef unsigned char *POINTER;
  
  /* UINT4 defines a four byte word */
  #if SIZEOF_LONG == 4
  typedef unsigned long int UINT4;
! #elif SIZEOF_SHORT == 4
! typedef unsigned short int UINT4;
! #elif INT_MAX == 2147483647
  typedef unsigned int UINT4;
! #else
! #error "Can't find a 4-byte integral type"
  #endif
  

Index: _sre.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/_sre.c,v
retrieving revision 2.77
retrieving revision 2.77.6.1
diff -C2 -d -r2.77 -r2.77.6.1
*** _sre.c	9 Dec 2001 16:13:15 -0000	2.77
--- _sre.c	31 Jul 2002 11:19:49 -0000	2.77.6.1
***************
*** 1789,1793 ****
  
  static PyObject*
! join(PyObject* list, PyObject* pattern)
  {
      /* join list elements */
--- 1789,1793 ----
  
  static PyObject*
! join_list(PyObject* list, PyObject* pattern)
  {
      /* join list elements */
***************
*** 2242,2246 ****
  
      /* convert list to single string (also removes list) */
!     item = join(list, self->pattern);
  
      if (!item)
--- 2242,2246 ----
  
      /* convert list to single string (also removes list) */
!     item = join_list(list, self->pattern);
  
      if (!item)