diff options
author | Zachary Ware <zachary.ware@gmail.com> | 2014-08-08 13:35:11 -0500 |
---|---|---|
committer | Zachary Ware <zachary.ware@gmail.com> | 2014-08-08 13:35:11 -0500 |
commit | 1810c3916fc87d4cd7d4c0dae810cc789e78c029 (patch) | |
tree | 8e277579f6c96d3c1d50b5d9c2e071d0177e8859 /Include/fileutils.h | |
parent | 99d441aeb15811da0be771d0c72e16a1705c11ad (diff) | |
parent | 39b6661075733cc36a335a09c735d09aa15618d5 (diff) | |
download | cpython-1810c3916fc87d4cd7d4c0dae810cc789e78c029.tar.gz |
Closes #22060: Merge with 3.4
Diffstat (limited to 'Include/fileutils.h')
-rw-r--r-- | Include/fileutils.h | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/Include/fileutils.h b/Include/fileutils.h index e9bad80b87..c5eebc5c07 100644 --- a/Include/fileutils.h +++ b/Include/fileutils.h @@ -7,11 +7,11 @@ extern "C" { PyAPI_FUNC(PyObject *) _Py_device_encoding(int); -PyAPI_FUNC(wchar_t *) _Py_char2wchar( +PyAPI_FUNC(wchar_t *) Py_DecodeLocale( const char *arg, size_t *size); -PyAPI_FUNC(char*) _Py_wchar2char( +PyAPI_FUNC(char*) Py_EncodeLocale( const wchar_t *text, size_t *error_pos); @@ -70,7 +70,14 @@ PyAPI_FUNC(int) _Py_set_inheritable(int fd, int inheritable, int *atomic_flag_works); PyAPI_FUNC(int) _Py_dup(int fd); -#endif + +#ifndef MS_WINDOWS +PyAPI_FUNC(int) _Py_get_blocking(int fd); + +PyAPI_FUNC(int) _Py_set_blocking(int fd, int blocking); +#endif /* !MS_WINDOWS */ + +#endif /* Py_LIMITED_API */ #ifdef __cplusplus } |