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

[Fredrik Lundh]

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

Modified Files:
	unicodeobject.h 
Log Message:


use Py_UNICODE_WIDE instead of USE_UCS4_STORAGE and Py_UNICODE_SIZE
tests.


Index: unicodeobject.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/unicodeobject.h,v
retrieving revision 2.25
retrieving revision 2.26
diff -C2 -r2.25 -r2.26
*** unicodeobject.h	2001/06/27 06:28:56	2.25
--- unicodeobject.h	2001/06/27 18:59:43	2.26
***************
*** 67,74 ****
  #endif
  
! /* experimental UCS-4 support.  enable at your own risk! */
! #undef USE_UCS4_STORAGE
! #if Py_UNICODE_SIZE == 4
! #define USE_UCS4_STORAGE
  #endif
  
--- 67,75 ----
  #endif
  
! /* Setting Py_UNICODE_WIDE enables UCS-4 storage.  Otherwise, Unicode
!    strings are stored as UCS-2 (with limited support for UTF-16) */
! 
! #if Py_UNICODE_SIZE >= 4
! #define Py_UNICODE_WIDE
  #endif
  
***************
*** 82,91 ****
  
  /* Windows has a usable wchar_t type (unless we're using UCS-4) */
! # if defined(MS_WIN32) && !defined(USE_UCS4_STORAGE)
  #  define HAVE_USABLE_WCHAR_T
  #  define PY_UNICODE_TYPE wchar_t
  # endif
  
! # if defined(USE_UCS4_STORAGE)
  #  define PY_UNICODE_TYPE Py_UCS4
  # endif
--- 83,92 ----
  
  /* Windows has a usable wchar_t type (unless we're using UCS-4) */
! # if defined(MS_WIN32) && Py_UNICODE_SIZE == 2
  #  define HAVE_USABLE_WCHAR_T
  #  define PY_UNICODE_TYPE wchar_t
  # endif
  
! # if defined(Py_UNICODE_WIDE)
  #  define PY_UNICODE_TYPE Py_UCS4
  # endif