[Python-checkins] CVS: python/dist/src/Include pyerrors.h,2.51,2.52

[Tim Peters]

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

Modified Files:
	pyerrors.h 
Log Message:
Removed preprocessor gimmick trying to force use of snprintf emulation
before 2.2b1.


Index: pyerrors.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/pyerrors.h,v
retrieving revision 2.51
retrieving revision 2.52
diff -C2 -d -r2.51 -r2.52
*** pyerrors.h	2001/10/23 02:19:10	2.51
--- pyerrors.h	2001/11/28 16:51:49	2.52
***************
*** 109,127 ****
  extern DL_IMPORT(void) PyErr_SyntaxLocation(char *, int);
  extern DL_IMPORT(PyObject *) PyErr_ProgramText(char *, int);
! 	
  /* These APIs aren't really part of the error implementation, but
     often needed to format error messages; the native C lib APIs are
     not available on all platforms, which is why we provide emulations
!    for those platforms in Python/mysnprintf.c */
  #if defined(MS_WIN32) && !defined(HAVE_SNPRINTF)
  # define HAVE_SNPRINTF
  # define snprintf _snprintf
  # define vsnprintf _vsnprintf
- #endif
- 
- /* Always enable the fallback solution during the 2.2.0 alpha cycle
-    for enhanced testing */
- #if PY_VERSION_HEX < 0x020200B0
- # undef HAVE_SNPRINTF
  #endif
  
--- 109,125 ----
  extern DL_IMPORT(void) PyErr_SyntaxLocation(char *, int);
  extern DL_IMPORT(PyObject *) PyErr_ProgramText(char *, int);
! 
  /* These APIs aren't really part of the error implementation, but
     often needed to format error messages; the native C lib APIs are
     not available on all platforms, which is why we provide emulations
!    for those platforms in Python/mysnprintf.c,
!    WARNING:  The return value of snprintf varies across platforms; do
!    not rely on any particular behavior; eventually the C99 defn may
!    be reliable.
! */
  #if defined(MS_WIN32) && !defined(HAVE_SNPRINTF)
  # define HAVE_SNPRINTF
  # define snprintf _snprintf
  # define vsnprintf _vsnprintf
  #endif