diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2015-03-06 22:47:02 (GMT) |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2015-03-06 22:47:02 (GMT) |
| commit | d81431f587e9eab67db683908548b0ad46847b38 (patch) | |
| tree | 69bbc1cdda06acab523871f322982b00931a3675 /Include | |
| parent | eef20de744cfdf971d5a80d6e3f9c7f7cb9e14fc (diff) | |
| download | cpython-d81431f587e9eab67db683908548b0ad46847b38.zip cpython-d81431f587e9eab67db683908548b0ad46847b38.tar.gz cpython-d81431f587e9eab67db683908548b0ad46847b38.tar.bz2 | |
Issue #23524: Replace _PyVerify_fd function with calling _set_thread_local_invalid_parameter_handler on every thread.
Diffstat (limited to 'Include')
| -rw-r--r-- | Include/fileobject.h | 11 | ||||
| -rw-r--r-- | Include/fileutils.h | 12 |
2 files changed, 12 insertions, 11 deletions
diff --git a/Include/fileobject.h b/Include/fileobject.h index 0939744..03155d3 100644 --- a/Include/fileobject.h +++ b/Include/fileobject.h @@ -32,17 +32,6 @@ PyAPI_DATA(int) Py_HasFileSystemDefaultEncoding; #ifndef Py_LIMITED_API PyAPI_FUNC(PyObject *) PyFile_NewStdPrinter(int); PyAPI_DATA(PyTypeObject) PyStdPrinter_Type; - -#if defined _MSC_VER && _MSC_VER >= 1400 -/* A routine to check if a file descriptor is valid on Windows. Returns 0 - * and sets errno to EBADF if it isn't. This is to avoid Assertions - * from various functions in the Windows CRT beginning with - * Visual Studio 2005 - */ -int _PyVerify_fd(int fd); -#else -#define _PyVerify_fd(A) (1) /* dummy */ -#endif #endif /* Py_LIMITED_API */ /* A routine to check if a file descriptor can be select()-ed. */ diff --git a/Include/fileutils.h b/Include/fileutils.h index bb90481..95632ed 100644 --- a/Include/fileutils.h +++ b/Include/fileutils.h @@ -108,6 +108,18 @@ PyAPI_FUNC(int) _Py_get_blocking(int fd); PyAPI_FUNC(int) _Py_set_blocking(int fd, int blocking); #endif /* !MS_WINDOWS */ +#if defined _MSC_VER && _MSC_VER >= 1400 +/* A routine to check if a file descriptor is valid on Windows. Returns 0 + * and sets errno to EBADF if it isn't. This is to avoid Assertions + * from various functions in the Windows CRT beginning with + * Visual Studio 2005 + */ +int _PyVerify_fd(int fd); + +#else +#define _PyVerify_fd(A) (1) /* dummy */ +#endif + #endif /* Py_LIMITED_API */ #ifdef __cplusplus |