[Python-checkins] CVS: python/dist/src/Objects unicodeobject.c,2.124.6.3,2.124.6.4

[Tim Peters]

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

Modified Files:
      Tag: release22-maint
	unicodeobject.c 
Log Message:
Move to zlib 1.1.4 on Windows (the new version that squashes the "double
free" glitch).

unicodeobject.c:  squash compiler warnings.

Noting that test_pyclbr currently fails in 2.2.1:

    test_others (__main__.PyclbrTest) ... ??? HTTP11
    FAIL



Index: unicodeobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/unicodeobject.c,v
retrieving revision 2.124.6.3
retrieving revision 2.124.6.4
diff -C2 -d -r2.124.6.3 -r2.124.6.4
*** unicodeobject.c	25 Feb 2002 14:51:00 -0000	2.124.6.3
--- unicodeobject.c	13 Mar 2002 23:56:48 -0000	2.124.6.4
***************
*** 1201,1205 ****
                      if (0xDC00 <= ch2 && ch2 <= 0xDFFF) {
                          
!                         if ((p - q) >= (cbAllocated - 4)) {
                              /* Provide enough room for some more
                                 surrogates */
--- 1201,1205 ----
                      if (0xDC00 <= ch2 && ch2 <= 0xDFFF) {
                          
!                         if ((Py_uintptr_t)(p - q) >= (cbAllocated - 4)) {
                              /* Provide enough room for some more
                                 surrogates */
***************
*** 1226,1230 ****
  
          } else {
!             if ((p - q) >= (cbAllocated - 4)) {
                  /* Provide enough room for some more
                     surrogates */
--- 1226,1230 ----
  
          } else {
!             if ((Py_uintptr_t)(p - q) >= (cbAllocated - 4)) {
                  /* Provide enough room for some more
                     surrogates */