[Python-checkins] cpython (3.6): Issue #28156: Export os.getpid() conditionally

[berker.peksag]

https://hg.python.org/cpython/rev/d17ff867580f
changeset:   103825:d17ff867580f
branch:      3.6
parent:      103823:976c487dfda2
user:        Berker Peksag <berker.peksag at gmail.com>
date:        Thu Sep 15 20:45:16 2016 +0300
summary:
  Issue #28156: Export os.getpid() conditionally

Patch by Ed Schouten.

files:
  Modules/clinic/posixmodule.c.h |  10 +++++++++-
  Modules/posixmodule.c          |   2 ++
  2 files changed, 11 insertions(+), 1 deletions(-)


diff --git a/Modules/clinic/posixmodule.c.h b/Modules/clinic/posixmodule.c.h
--- a/Modules/clinic/posixmodule.c.h
+++ b/Modules/clinic/posixmodule.c.h
@@ -2349,6 +2349,8 @@
 
 #endif /* defined(HAVE_GETGID) */
 
+#if defined(HAVE_GETPID)
+
 PyDoc_STRVAR(os_getpid__doc__,
 "getpid($module, /)\n"
 "--\n"
@@ -2367,6 +2369,8 @@
     return os_getpid_impl(module);
 }
 
+#endif /* defined(HAVE_GETPID) */
+
 #if defined(HAVE_GETGROUPS)
 
 PyDoc_STRVAR(os_getgroups__doc__,
@@ -5841,6 +5845,10 @@
     #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 @@
 #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
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -5895,6 +5895,7 @@
 #endif /* HAVE_GETGID */
 
 
+#ifdef HAVE_GETPID
 /*[clinic input]
 os.getpid
 
@@ -5907,6 +5908,7 @@
 {
     return PyLong_FromPid(getpid());
 }
+#endif /* HAVE_GETPID */
 
 #ifdef HAVE_GETGROUPLIST
 

-- 
Repository URL: https://hg.python.org/cpython