[Python-checkins] bpo-41625: Do not add os.splice on AIX due to compatibility issues (GH-23608)

pablogsal webhook-mailer at python.org
Wed Dec 2 12:57:23 EST 2020


https://github.com/python/cpython/commit/dedc2cd5f02a2e2fc2c995a36a3dccf9d93856bb
commit: dedc2cd5f02a2e2fc2c995a36a3dccf9d93856bb
branch: master
author: Pablo Galindo <Pablogsal at gmail.com>
committer: pablogsal <Pablogsal at gmail.com>
date: 2020-12-02T17:57:18Z
summary:

bpo-41625: Do not add os.splice on AIX due to compatibility issues (GH-23608)

files:
M Modules/clinic/posixmodule.c.h
M Modules/posixmodule.c

diff --git a/Modules/clinic/posixmodule.c.h b/Modules/clinic/posixmodule.c.h
index ee4ee8ceac558..4a72ea0dd56f4 100644
--- a/Modules/clinic/posixmodule.c.h
+++ b/Modules/clinic/posixmodule.c.h
@@ -5674,7 +5674,7 @@ os_copy_file_range(PyObject *module, PyObject *const *args, Py_ssize_t nargs, Py
 
 #endif /* defined(HAVE_COPY_FILE_RANGE) */
 
-#if defined(HAVE_SPLICE)
+#if ((defined(HAVE_SPLICE) && !defined(_AIX)))
 
 PyDoc_STRVAR(os_splice__doc__,
 "splice($module, /, src, dst, count, offset_src=None, offset_dst=None,\n"
@@ -5772,7 +5772,7 @@ os_splice(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject *k
     return return_value;
 }
 
-#endif /* defined(HAVE_SPLICE) */
+#endif /* ((defined(HAVE_SPLICE) && !defined(_AIX))) */
 
 #if defined(HAVE_MKFIFO)
 
@@ -9163,4 +9163,4 @@ os_waitstatus_to_exitcode(PyObject *module, PyObject *const *args, Py_ssize_t na
 #ifndef OS_WAITSTATUS_TO_EXITCODE_METHODDEF
     #define OS_WAITSTATUS_TO_EXITCODE_METHODDEF
 #endif /* !defined(OS_WAITSTATUS_TO_EXITCODE_METHODDEF) */
-/*[clinic end generated code: output=8a59e91178897267 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=f3ec08afcd6cd8f8 input=a9049054013a1b77]*/
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index 3e6e6585b880c..d9eb62f20e65b 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -10370,7 +10370,7 @@ os_copy_file_range_impl(PyObject *module, int src, int dst, Py_ssize_t count,
 }
 #endif /* HAVE_COPY_FILE_RANGE*/
 
-#ifdef HAVE_SPLICE
+#if (defined(HAVE_SPLICE) && !defined(_AIX))
 /*[clinic input]
 
 os.splice



More information about the Python-checkins mailing list