From 2c467d660f0f5730115b88536a30b3fb61eae2cb Mon Sep 17 00:00:00 2001 From: Hirokazu Yamamoto Date: Sun, 17 May 2009 04:21:53 +0000 Subject: Merged revisions 72698-72699 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r72698 | hirokazu.yamamoto | 2009-05-17 11:52:09 +0900 | 1 line Issue #3527: Removed Py_WIN_WIDE_FILENAMES which is not used any more. ........ r72699 | hirokazu.yamamoto | 2009-05-17 11:58:36 +0900 | 1 line Added NEWS for r72698. ........ --- Python/errors.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'Python/errors.c') diff --git a/Python/errors.c b/Python/errors.c index cccc0f7778..2169a1ab7a 100644 --- a/Python/errors.c +++ b/Python/errors.c @@ -461,7 +461,7 @@ PyErr_SetFromErrnoWithFilename(PyObject *exc, const char *filename) return result; } -#ifdef Py_WIN_WIDE_FILENAMES +#ifdef MS_WINDOWS PyObject * PyErr_SetFromErrnoWithUnicodeFilename(PyObject *exc, const Py_UNICODE *filename) { @@ -472,7 +472,7 @@ PyErr_SetFromErrnoWithUnicodeFilename(PyObject *exc, const Py_UNICODE *filename) Py_XDECREF(name); return result; } -#endif /* Py_WIN_WIDE_FILENAMES */ +#endif /* MS_WINDOWS */ PyObject * PyErr_SetFromErrno(PyObject *exc) @@ -549,7 +549,6 @@ PyObject *PyErr_SetExcFromWindowsErrWithFilename( return ret; } -#ifdef Py_WIN_WIDE_FILENAMES PyObject *PyErr_SetExcFromWindowsErrWithUnicodeFilename( PyObject *exc, int ierr, @@ -564,7 +563,6 @@ PyObject *PyErr_SetExcFromWindowsErrWithUnicodeFilename( Py_XDECREF(name); return ret; } -#endif /* Py_WIN_WIDE_FILENAMES */ PyObject *PyErr_SetExcFromWindowsErr(PyObject *exc, int ierr) { @@ -588,7 +586,6 @@ PyObject *PyErr_SetFromWindowsErrWithFilename( return result; } -#ifdef Py_WIN_WIDE_FILENAMES PyObject *PyErr_SetFromWindowsErrWithUnicodeFilename( int ierr, const Py_UNICODE *filename) @@ -602,7 +599,6 @@ PyObject *PyErr_SetFromWindowsErrWithUnicodeFilename( Py_XDECREF(name); return result; } -#endif /* Py_WIN_WIDE_FILENAMES */ #endif /* MS_WINDOWS */ void -- cgit v1.2.1