From 5ce1069a6ff0d5443074d33ba1d403ccd2eaf3d3 Mon Sep 17 00:00:00 2001
From: xdegaye <xdegaye@gmail.com>
Date: Thu, 23 Nov 2017 12:01:36 +0100
Subject: bpo-28762: Revert last commit (now using Android Unified Headers)
 (GH-4488)

---
 configure | 31 +------------------------------
 1 file changed, 1 insertion(+), 30 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index 969e1d51c6..d02675742d 100755
--- a/configure
+++ b/configure
@@ -11147,7 +11147,7 @@ for ac_func in alarm accept4 setitimer getitimer bind_textdomain_codeset chown \
  getgrouplist getgroups getlogin getloadavg getpeername getpgid getpid \
  getpriority getresuid getresgid getpwent getspnam getspent getsid getwd \
  if_nameindex \
- initgroups kill killpg lchmod lchown linkat lstat lutimes mmap \
+ initgroups kill killpg lchmod lchown lockf linkat lstat lutimes mmap \
  memrchr mbrtowc mkdirat mkfifo \
  mkfifoat mknod mknodat mktime mremap nice openat pathconf pause pipe2 plock poll \
  posix_fallocate posix_fadvise pread \
@@ -12577,35 +12577,6 @@ else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-
-# Issue #28762: lockf() is available on Android API level 24, but the F_LOCK
-# macro is not defined in android-ndk-r13.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for lockf" >&5
-$as_echo_n "checking for lockf... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <unistd.h>
-int
-main ()
-{
-lockf(0, F_LOCK, 0);
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-
-$as_echo "#define HAVE_LOCKF 1" >>confdefs.h
-
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-- 
cgit v1.2.1