bpo-28762: Revert last commit (now using Android Unified Headers) (GH… · python/cpython@5ce1069 (original) (raw)

4 files changed

lines changed

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1 +Revert the last commit, the F_LOCK macro is defined by Android Unified Headers.
Original file line number Diff line number Diff line change
@@ -11147,7 +11147,7 @@ for ac_func in alarm accept4 setitimer getitimer bind_textdomain_codeset chown \
11147 11147 getgrouplist getgroups getlogin getloadavg getpeername getpgid getpid \
11148 11148 getpriority getresuid getresgid getpwent getspnam getspent getsid getwd \
11149 11149 if_nameindex \
11150 - initgroups kill killpg lchmod lchown linkat lstat lutimes mmap \
11150 + initgroups kill killpg lchmod lchown lockf linkat lstat lutimes mmap \
11151 11151 memrchr mbrtowc mkdirat mkfifo \
11152 11152 mkfifoat mknod mknodat mktime mremap nice openat pathconf pause pipe2 plock poll \
11153 11153 posix_fallocate posix_fadvise pread \
@@ -12577,35 +12577,6 @@ else
12577 12577 { asecho"as_echo "asecho"as_me:${as_lineno-$LINENO}: result: no" >&5
12578 12578 $as_echo "no" >&6; }
12579 12579
12580 -fi
12581 -rm -f core conftest.err conftest.$ac_objext \
12582 - conftest$ac_exeext conftest.$ac_ext
12583 -
12584 -# Issue #28762: lockf() is available on Android API level 24, but the F_LOCK
12585 -# macro is not defined in android-ndk-r13.
12586 -{ asecho"as_echo "asecho"as_me:${as_lineno-$LINENO}: checking for lockf" >&5
12587 -$as_echo_n "checking for lockf... " >&6; }
12588 -cat confdefs.h - <<_ACEOF >conftest.$ac_ext
12589 -/* end confdefs.h. */
12590 -#include <unistd.h>
12591 -int
12592 -main ()
12593 -{
12594 -lockf(0, F_LOCK, 0);
12595 - ;
12596 - return 0;
12597 -}
12598 -_ACEOF
12599 -if ac_fn_c_try_link "$LINENO"; then :
12600 -
12601 -$as_echo "#define HAVE_LOCKF 1" >>confdefs.h
12602 -
12603 - { asecho"as_echo "asecho"as_me:${as_lineno-$LINENO}: result: yes" >&5
12604 -$as_echo "yes" >&6; }
12605 -else
12606 - { asecho"as_echo "asecho"as_me:${as_lineno-$LINENO}: result: no" >&5
12607 -$as_echo "no" >&6; }
12608 -
12609 12580 fi
12610 12581 rm -f core conftest.err conftest.$ac_objext \
12611 12582 conftest$ac_exeext conftest.$ac_ext
Original file line number Diff line number Diff line change
@@ -3415,7 +3415,7 @@ AC_CHECK_FUNCS(alarm accept4 setitimer getitimer bind_textdomain_codeset chown \
3415 3415 getgrouplist getgroups getlogin getloadavg getpeername getpgid getpid \
3416 3416 getpriority getresuid getresgid getpwent getspnam getspent getsid getwd \
3417 3417 if_nameindex \
3418 -initgroups kill killpg lchmod lchown linkat lstat lutimes mmap \
3418 +initgroups kill killpg lchmod lchown lockf linkat lstat lutimes mmap \
3419 3419 memrchr mbrtowc mkdirat mkfifo \
3420 3420 mkfifoat mknod mknodat mktime mremap nice openat pathconf pause pipe2 plock poll \
3421 3421 posix_fallocate posix_fadvise pread \
@@ -3764,15 +3764,6 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
3764 3764 AC_MSG_RESULT(no)
3765 3765 ])
3766 3766
3767 -# Issue #28762: lockf() is available on Android API level 24, but the F_LOCK
3768 -# macro is not defined in android-ndk-r13.
3769 -AC_MSG_CHECKING(for lockf)
3770 -AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <unistd.h> ]],[[lockf(0, F_LOCK, 0);]])],
3771 -[AC_DEFINE(HAVE_LOCKF, 1, Define to 1 if you have the 'lockf' function and the F_LOCK macro.)
3772 - AC_MSG_RESULT(yes)],
3773 -[AC_MSG_RESULT(no)
3774 -])
3775 -
3776 3767 # On OSF/1 V5.1, getaddrinfo is available, but a define
3777 3768 # for [no]getaddrinfo in netdb.h.
3778 3769 AC_MSG_CHECKING(for getaddrinfo)
Original file line number Diff line number Diff line change
@@ -601,7 +601,7 @@
601 601 /* Define to 1 if you have the <linux/vm_sockets.h> header file. */
602 602 #undef HAVE_LINUX_VM_SOCKETS_H
603 603
604 -/* Define to 1 if you have the 'lockf' function and the F_LOCK macro. */
604 +/* Define to 1 if you have the `lockf' function. */
605 605 #undef HAVE_LOCKF
606 606
607 607 /* Define to 1 if you have the `log1p' function. */