[Python-checkins] python/dist/src/Include pyerrors.h,2.60,2.61

[mhammond@users.sourceforge.net]

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

Modified Files:
	pyerrors.h 
Log Message:
Patch 594001: PEP 277 - Unicode file name support for Windows NT.


Index: pyerrors.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/pyerrors.h,v
retrieving revision 2.60
retrieving revision 2.61
diff -C2 -d -r2.60 -r2.61
*** pyerrors.h	15 Sep 2002 14:09:21 -0000	2.60
--- pyerrors.h	3 Oct 2002 05:10:38 -0000	2.61
***************
*** 82,95 ****
  PyAPI_FUNC(PyObject *) PyErr_NoMemory(void);
  PyAPI_FUNC(PyObject *) PyErr_SetFromErrno(PyObject *);
  PyAPI_FUNC(PyObject *) PyErr_SetFromErrnoWithFilename(PyObject *, char *);
  PyAPI_FUNC(PyObject *) PyErr_Format(PyObject *, const char *, ...)
  			Py_GCC_ATTRIBUTE((format(printf, 2, 3)));
  #ifdef MS_WINDOWS
! PyAPI_FUNC(PyObject *) PyErr_SetFromWindowsErrWithFilename(int, const char *);
  PyAPI_FUNC(PyObject *) PyErr_SetFromWindowsErr(int);
  PyAPI_FUNC(PyObject *) PyErr_SetExcFromWindowsErrWithFilename(
  	PyObject *,int, const char *);
  PyAPI_FUNC(PyObject *) PyErr_SetExcFromWindowsErr(PyObject *, int);
! #endif
  
  /* Export the old function so that the existing API remains available: */
--- 82,116 ----
  PyAPI_FUNC(PyObject *) PyErr_NoMemory(void);
  PyAPI_FUNC(PyObject *) PyErr_SetFromErrno(PyObject *);
+ PyAPI_FUNC(PyObject *) PyErr_SetFromErrnoWithFilenameObject(
+ 	PyObject *, PyObject *);
  PyAPI_FUNC(PyObject *) PyErr_SetFromErrnoWithFilename(PyObject *, char *);
+ #ifdef Py_WIN_WIDE_FILENAMES
+ PyAPI_FUNC(PyObject *) PyErr_SetFromErrnoWithUnicodeFilename(
+ 	PyObject *, Py_UNICODE *);
+ #endif /* Py_WIN_WIDE_FILENAMES */
+ 
  PyAPI_FUNC(PyObject *) PyErr_Format(PyObject *, const char *, ...)
  			Py_GCC_ATTRIBUTE((format(printf, 2, 3)));
+ 
  #ifdef MS_WINDOWS
! PyAPI_FUNC(PyObject *) PyErr_SetFromWindowsErrWithFilenameObject(
! 	int, const char *);
! PyAPI_FUNC(PyObject *) PyErr_SetFromWindowsErrWithFilename(
! 	int, const char *);
! #ifdef Py_WIN_WIDE_FILENAMES
! PyAPI_FUNC(PyObject *) PyErr_SetFromWindowsErrWithUnicodeFilename(
! 	int, const Py_UNICODE *);
! #endif /* Py_WIN_WIDE_FILENAMES */
  PyAPI_FUNC(PyObject *) PyErr_SetFromWindowsErr(int);
+ PyAPI_FUNC(PyObject *) PyErr_SetExcFromWindowsErrWithFilenameObject(
+ 	PyObject *,int, PyObject *);
  PyAPI_FUNC(PyObject *) PyErr_SetExcFromWindowsErrWithFilename(
  	PyObject *,int, const char *);
+ #ifdef Py_WIN_WIDE_FILENAMES
+ PyAPI_FUNC(PyObject *) PyErr_SetExcFromWindowsErrWithUnicodeFilename(
+ 	PyObject *,int, const Py_UNICODE *);
+ #endif /* Py_WIN_WIDE_FILENAMES */
  PyAPI_FUNC(PyObject *) PyErr_SetExcFromWindowsErr(PyObject *, int);
! #endif /* MS_WINDOWS */
  
  /* Export the old function so that the existing API remains available: */