mirror of
https://github.com/python/cpython
synced 2024-09-05 08:17:45 +00:00
Issue #28762: lockf() is available on Android API level 24, but the
F_LOCK macro is not defined in android-ndk-r13.
This commit is contained in:
parent
437a5d2c25
commit
bdf0d0f039
|
@ -84,6 +84,9 @@ Tests
|
|||
Build
|
||||
-----
|
||||
|
||||
- Issue #28762: lockf() is available on Android API level 24, but the F_LOCK
|
||||
macro is not defined in android-ndk-r13.
|
||||
|
||||
- Issue #28538: Fix the compilation error that occurs because if_nameindex() is
|
||||
available on Android API level 24, but the if_nameindex structure is not
|
||||
defined.
|
||||
|
|
31
configure
vendored
31
configure
vendored
|
@ -11198,7 +11198,7 @@ for ac_func in alarm accept4 setitimer getitimer bind_textdomain_codeset chown \
|
|||
futimens futimes gai_strerror getentropy \
|
||||
getgrouplist getgroups getlogin getloadavg getpeername getpgid getpid \
|
||||
getpriority getresuid getresgid getpwent getspnam getspent getsid getwd \
|
||||
initgroups kill killpg lchmod lchown lockf linkat lstat lutimes mmap \
|
||||
initgroups kill killpg lchmod lchown 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 \
|
||||
|
@ -12686,6 +12686,35 @@ 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
|
||||
|
|
11
configure.ac
11
configure.ac
|
@ -3384,7 +3384,7 @@ AC_CHECK_FUNCS(alarm accept4 setitimer getitimer bind_textdomain_codeset chown \
|
|||
futimens futimes gai_strerror getentropy \
|
||||
getgrouplist getgroups getlogin getloadavg getpeername getpgid getpid \
|
||||
getpriority getresuid getresgid getpwent getspnam getspent getsid getwd \
|
||||
initgroups kill killpg lchmod lchown lockf linkat lstat lutimes mmap \
|
||||
initgroups kill killpg lchmod lchown 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 \
|
||||
|
@ -3761,6 +3761,15 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
|
|||
[AC_MSG_RESULT(no)
|
||||
])
|
||||
|
||||
# Issue #28762: lockf() is available on Android API level 24, but the F_LOCK
|
||||
# macro is not defined in android-ndk-r13.
|
||||
AC_MSG_CHECKING(for lockf)
|
||||
AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <unistd.h> ]],[[lockf(0, F_LOCK, 0);]])],
|
||||
[AC_DEFINE(HAVE_LOCKF, 1, Define to 1 if you have the 'lockf' function and the F_LOCK macro.)
|
||||
AC_MSG_RESULT(yes)],
|
||||
[AC_MSG_RESULT(no)
|
||||
])
|
||||
|
||||
# On OSF/1 V5.1, getaddrinfo is available, but a define
|
||||
# for [no]getaddrinfo in netdb.h.
|
||||
AC_MSG_CHECKING(for getaddrinfo)
|
||||
|
|
|
@ -472,7 +472,7 @@
|
|||
/* Define to 1 if you have the <ieeefp.h> header file. */
|
||||
#undef HAVE_IEEEFP_H
|
||||
|
||||
/* Define to 1 if you have the `if_nameindex' function. */
|
||||
/* Define to 1 if you have the 'if_nameindex' function. */
|
||||
#undef HAVE_IF_NAMEINDEX
|
||||
|
||||
/* Define if you have the 'inet_aton' function. */
|
||||
|
@ -574,7 +574,7 @@
|
|||
/* Define to 1 if you have the <linux/tipc.h> header file. */
|
||||
#undef HAVE_LINUX_TIPC_H
|
||||
|
||||
/* Define to 1 if you have the `lockf' function. */
|
||||
/* Define to 1 if you have the 'lockf' function and the F_LOCK macro. */
|
||||
#undef HAVE_LOCKF
|
||||
|
||||
/* Define to 1 if you have the `log1p' function. */
|
||||
|
|
Loading…
Reference in a new issue