[Python-checkins] CVS: python/dist/src/Include unicodeobject.h,2.4,2.5

[Guido van Rossum]

Update of /projects/cvsroot/python/dist/src/Include
In directory eric:/home/guido/hp/mal/py-patched/Include

Modified Files:
	unicodeobject.h 
Log Message:
Marc-Andre Lemburg:

The attached patch set includes a workaround to get Python with
Unicode compile on BSDI 4.x (courtesy Thomas Wouters; the cause
is a bug in the BSDI wchar.h header file) and Python interfaces
for the MBCS codec donated by Mark Hammond.

Also included are some minor corrections w/r to the docs of
the new "es" and "es#" parser markers (use PyMem_Free() instead
of free(); thanks to Mark Hammond for finding these).

The unicodedata tests are now in a separate file
(test_unicodedata.py) to avoid problems if the module cannot
be found.



Index: unicodeobject.h
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Include/unicodeobject.h,v
retrieving revision 2.4
retrieving revision 2.5
diff -C2 -r2.4 -r2.5
*** unicodeobject.h	2000/03/28 02:01:15	2.4
--- unicodeobject.h	2000/03/28 20:29:50	2.5
***************
*** 83,86 ****
--- 83,90 ----
  
  #ifdef HAVE_WCHAR_H
+ /* Work around a cosmetic bug in BSDI 4.x wchar.h; thanks to Thomas Wouters */
+ # ifdef _HAVE_BSDI
+ #  include <time.h>
+ # endif
  # include "wchar.h"
  #endif
***************
*** 563,567 ****
--- 567,573 ----
  
  #ifdef MS_WIN32
+ 
  /* --- MBCS codecs for Windows -------------------------------------------- */
+ 
  extern DL_IMPORT(PyObject*) PyUnicode_DecodeMBCS(
      const char *string,         /* MBCS encoded string */
***************
*** 580,585 ****
      );
  
- 
  #endif /* MS_WIN32 */
  /* --- Methods & Slots ----------------------------------------------------
  
--- 586,591 ----
      );
  
  #endif /* MS_WIN32 */
+ 
  /* --- Methods & Slots ----------------------------------------------------