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

[Barry A. Warsaw]

Update of /projects/cvsroot/python/dist/src/Include
In directory anthem:/home/bwarsaw/projects/python/Include

Modified Files:
	unicodeobject.h 
Log Message:
On 17-Mar-2000, Marc-Andre Lemburg said:

    Attached you find an update of the Unicode implementation.

    The patch is against the current CVS version. I would appreciate
    if someone with CVS checkin permissions could check the changes
    in.

    The patch contains all bugs and patches sent this week and also
    fixes a leak in the codecs code and a bug in the free list code
    for Unicode objects (which only shows up when compiling Python
    with Py_DEBUG; thanks to MarkH for spotting this one).


Index: unicodeobject.h
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Include/unicodeobject.h,v
retrieving revision 2.2
retrieving revision 2.3
diff -C2 -r2.2 -r2.3
*** unicodeobject.h	2000/03/13 23:22:24	2.2
--- unicodeobject.h	2000/03/20 16:36:22	2.3
***************
*** 1,7 ****
  #ifndef Py_UNICODEOBJECT_H
  #define Py_UNICODEOBJECT_H
- #ifdef __cplusplus
- extern "C" {
- #endif
  
  /*
--- 1,4 ----
***************
*** 110,115 ****
  
  /* If you want Python to use the compiler's wctype.h functions instead
!    of the ones supplied with Python, define WANT_WCTYPE_FUNCTIONS.
!    This reduces the interpreter's code size. */
  
  #if defined(HAVE_USABLE_WCHAR_T) && defined(WANT_WCTYPE_FUNCTIONS)
--- 107,113 ----
  
  /* If you want Python to use the compiler's wctype.h functions instead
!    of the ones supplied with Python, define WANT_WCTYPE_FUNCTIONS or
!    configure Python using --with-ctype-functions.  This reduces the
!    interpreter's code size. */
  
  #if defined(HAVE_USABLE_WCHAR_T) && defined(WANT_WCTYPE_FUNCTIONS)
***************
*** 170,173 ****
--- 168,175 ----
               (substring)->length*sizeof(Py_UNICODE)))
  
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+ 
  /* --- Unicode Type ------------------------------------------------------- */
  
***************
*** 648,652 ****
      );
  
! /* Count the number of occurances of substr in str[start:end]. */
  
  extern DL_IMPORT(int) PyUnicode_Count(
--- 650,654 ----
      );
  
! /* Count the number of occurrences of substr in str[start:end]. */
  
  extern DL_IMPORT(int) PyUnicode_Count(
***************
*** 657,661 ****
      );
  
! /* Replace at most maxcount occurances of substr in str with replstr
     and return the resulting Unicode object. */
  
--- 659,663 ----
      );
  
! /* Replace at most maxcount occurrences of substr in str with replstr
     and return the resulting Unicode object. */