Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
5ce1069a
Commit
5ce1069a
authored
7 years ago
by
xdegaye
Committed by
GitHub
7 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bpo-28762: Revert last commit (now using Android Unified Headers) (GH-4488)
parent
c06c22e9
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
41 deletions
+4
-41
Misc/NEWS.d/next/Build/2017-11-21-17-12-24.bpo-28762.R6uu8w.rst
...EWS.d/next/Build/2017-11-21-17-12-24.bpo-28762.R6uu8w.rst
+1
-0
configure
configure
+1
-30
configure.ac
configure.ac
+1
-10
pyconfig.h.in
pyconfig.h.in
+1
-1
No files found.
Misc/NEWS.d/next/Build/2017-11-21-17-12-24.bpo-28762.R6uu8w.rst
0 → 100644
View file @
5ce1069a
Revert the last commit, the F_LOCK macro is defined by Android Unified Headers.
This diff is collapsed.
Click to expand it.
configure
View file @
5ce1069a
...
...
@@ -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 l
ockf l
inkat 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
...
...
This diff is collapsed.
Click to expand it.
configure.ac
View file @
5ce1069a
...
...
@@ -3415,7 +3415,7 @@ AC_CHECK_FUNCS(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 l
ockf l
inkat lstat lutimes mmap \
memrchr mbrtowc mkdirat mkfifo \
mkfifoat mknod mknodat mktime mremap nice openat pathconf pause pipe2 plock poll \
posix_fallocate posix_fadvise pread \
...
...
@@ -3764,15 +3764,6 @@ 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)
...
...
This diff is collapsed.
Click to expand it.
pyconfig.h.in
View file @
5ce1069a
...
...
@@ -601,7 +601,7 @@
/* Define to 1 if you have the <linux/vm_sockets.h> header file. */
#undef HAVE_LINUX_VM_SOCKETS_H
/* Define to 1 if you have the
'lockf' function and the F_LOCK macro
. */
/* Define to 1 if you have the
`lockf' function
. */
#undef HAVE_LOCKF
/* Define to 1 if you have the `log1p' function. */
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment