From 3940499ca8f6a74baa27ac83435c8bfae3ca42b7 Mon Sep 17 00:00:00 2001 From: Berker Peksag Date: Thu, 15 Sep 2016 20:45:16 +0300 Subject: Issue #28156: Export os.getpid() conditionally Patch by Ed Schouten. --- Modules/clinic/posixmodule.c.h | 10 +++++++++- Modules/posixmodule.c | 2 ++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/Modules/clinic/posixmodule.c.h b/Modules/clinic/posixmodule.c.h index fdb3970..72d7834 100644 --- a/Modules/clinic/posixmodule.c.h +++ b/Modules/clinic/posixmodule.c.h @@ -2349,6 +2349,8 @@ os_getgid(PyObject *module, PyObject *Py_UNUSED(ignored)) #endif /* defined(HAVE_GETGID) */ +#if defined(HAVE_GETPID) + PyDoc_STRVAR(os_getpid__doc__, "getpid($module, /)\n" "--\n" @@ -2367,6 +2369,8 @@ os_getpid(PyObject *module, PyObject *Py_UNUSED(ignored)) return os_getpid_impl(module); } +#endif /* defined(HAVE_GETPID) */ + #if defined(HAVE_GETGROUPS) PyDoc_STRVAR(os_getgroups__doc__, @@ -5841,6 +5845,10 @@ exit: #define OS_GETGID_METHODDEF #endif /* !defined(OS_GETGID_METHODDEF) */ +#ifndef OS_GETPID_METHODDEF + #define OS_GETPID_METHODDEF +#endif /* !defined(OS_GETPID_METHODDEF) */ + #ifndef OS_GETGROUPS_METHODDEF #define OS_GETGROUPS_METHODDEF #endif /* !defined(OS_GETGROUPS_METHODDEF) */ @@ -6140,4 +6148,4 @@ exit: #ifndef OS_GETRANDOM_METHODDEF #define OS_GETRANDOM_METHODDEF #endif /* !defined(OS_GETRANDOM_METHODDEF) */ -/*[clinic end generated code: output=dfa6bc9d1f2db750 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=b9ed5703d2feb0d9 input=a9049054013a1b77]*/ diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c index 32d0978..84566d8 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -5895,6 +5895,7 @@ os_getgid_impl(PyObject *module) #endif /* HAVE_GETGID */ +#ifdef HAVE_GETPID /*[clinic input] os.getpid @@ -5907,6 +5908,7 @@ os_getpid_impl(PyObject *module) { return PyLong_FromPid(getpid()); } +#endif /* HAVE_GETPID */ #ifdef HAVE_GETGROUPLIST -- cgit v0.12