[Python-checkins] cpython: Issue #26863: HAVE_FACCESSAT should (currently) not be defined on Android.

stefan.krah python-checkins at python.org
Tue Apr 26 11:04:47 EDT 2016


https://hg.python.org/cpython/rev/f4c6dab59cd8
changeset:   101162:f4c6dab59cd8
user:        Stefan Krah <skrah at bytereef.org>
date:        Tue Apr 26 17:04:18 2016 +0200
summary:
  Issue #26863: HAVE_FACCESSAT should (currently) not be defined on Android.

files:
  Modules/posixmodule.c |  8 +++++++-
  1 files changed, 7 insertions(+), 1 deletions(-)


diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -32,6 +32,12 @@
 #include "winreparse.h"
 #endif
 
+/* On android API level 21, 'AT_EACCESS' is not declared although
+ * HAVE_FACCESSAT is defined. */
+#ifdef __ANDROID__
+#undef HAVE_FACCESSAT
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -5933,7 +5939,7 @@
     if (_Py_set_inheritable(master_fd, 0, NULL) < 0)
         goto posix_error;
 
-#if !defined(__CYGWIN__) && !defined(HAVE_DEV_PTC)
+#if !defined(__CYGWIN__) && !defined(__ANDROID__) && !defined(HAVE_DEV_PTC)
     ioctl(slave_fd, I_PUSH, "ptem"); /* push ptem */
     ioctl(slave_fd, I_PUSH, "ldterm"); /* push ldterm */
 #ifndef __hpux

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


More information about the Python-checkins mailing list