diff options
Diffstat (limited to 'Include')
| -rw-r--r-- | Include/abstract.h | 3 | ||||
| -rw-r--r-- | Include/longobject.h | 17 | ||||
| -rw-r--r-- | Include/pythonrun.h | 3 |
3 files changed, 23 insertions, 0 deletions
diff --git a/Include/abstract.h b/Include/abstract.h index 6d40ef74af..d2e9682ba4 100644 --- a/Include/abstract.h +++ b/Include/abstract.h @@ -1232,6 +1232,9 @@ PyAPI_FUNC(int) _PyObject_RealIsInstance(PyObject *inst, PyObject *cls); PyAPI_FUNC(int) _PyObject_RealIsSubclass(PyObject *derived, PyObject *cls); +PyAPI_FUNC(char *const *) _PySequence_BytesToCharpArray(PyObject* self); + +PyAPI_FUNC(void) _Py_FreeCharPArray(char *const array[]); #ifdef __cplusplus } diff --git a/Include/longobject.h b/Include/longobject.h index 83d780d63c..4dc2e18af8 100644 --- a/Include/longobject.h +++ b/Include/longobject.h @@ -41,6 +41,23 @@ PyAPI_FUNC(PyObject *) PyLong_GetInfo(void); #define PyLong_AsSocket_t(fd) (SOCKET_T)PyLong_AsLongLong(fd) #endif +/* Issue #1983: pid_t can be longer than a C long on some systems */ +#if !defined(SIZEOF_PID_T) || SIZEOF_PID_T == SIZEOF_INT +#define PARSE_PID "i" +#define PyLong_FromPid PyLong_FromLong +#define PyLong_AsPid PyLong_AsLong +#elif SIZEOF_PID_T == SIZEOF_LONG +#define PARSE_PID "l" +#define PyLong_FromPid PyLong_FromLong +#define PyLong_AsPid PyLong_AsLong +#elif defined(SIZEOF_LONG_LONG) && SIZEOF_PID_T == SIZEOF_LONG_LONG +#define PARSE_PID "L" +#define PyLong_FromPid PyLong_FromLongLong +#define PyLong_AsPid PyLong_AsLongLong +#else +#error "sizeof(pid_t) is neither sizeof(int), sizeof(long) or sizeof(long long)" +#endif /* SIZEOF_PID_T */ + /* For use by intobject.c only */ PyAPI_DATA(unsigned char) _PyLong_DigitValue[256]; diff --git a/Include/pythonrun.h b/Include/pythonrun.h index 09d3ee5530..b49ad96b81 100644 --- a/Include/pythonrun.h +++ b/Include/pythonrun.h @@ -81,6 +81,9 @@ PyAPI_FUNC(int) Py_AtExit(void (*func)(void)); PyAPI_FUNC(void) Py_Exit(int); +/* Restore signals that the interpreter has called SIG_IGN on to SIG_DFL. */ +PyAPI_FUNC(void) _Py_RestoreSignals(void); + PyAPI_FUNC(int) Py_FdIsInteractive(FILE *, const char *); /* Bootstrap */ |