mirror of
https://github.com/php/php-src.git
synced 2024-11-28 20:34:29 +08:00
Merge branch 'PHP-7.4'
* PHP-7.4: Clean headers checks
This commit is contained in:
commit
6bfa6bff0b
11
Zend/Zend.m4
11
Zend/Zend.m4
@ -126,16 +126,7 @@ dnl
|
||||
AC_DEFUN([LIBZEND_BASIC_CHECKS],[
|
||||
AC_REQUIRE([AC_PROG_CC])
|
||||
|
||||
AC_CHECK_HEADERS(
|
||||
inttypes.h \
|
||||
stdint.h \
|
||||
malloc.h \
|
||||
unistd.h \
|
||||
sys/types.h \
|
||||
sys/time.h \
|
||||
unix.h \
|
||||
cpuid.h \
|
||||
dlfcn.h)
|
||||
AC_CHECK_HEADERS([cpuid.h])
|
||||
|
||||
dnl
|
||||
dnl LIBZEND_DLSYM_CHECK
|
||||
|
@ -437,12 +437,14 @@ ieeefp.h \
|
||||
langinfo.h \
|
||||
limits.h \
|
||||
locale.h \
|
||||
malloc.h \
|
||||
monetary.h \
|
||||
netdb.h \
|
||||
poll.h \
|
||||
pwd.h \
|
||||
resolv.h \
|
||||
signal.h \
|
||||
strings.h \
|
||||
syslog.h \
|
||||
sysexits.h \
|
||||
sys/ioctl.h \
|
||||
@ -458,6 +460,7 @@ sys/statfs.h \
|
||||
sys/statvfs.h \
|
||||
sys/vfs.h \
|
||||
sys/sysexits.h \
|
||||
sys/uio.h \
|
||||
sys/wait.h \
|
||||
sys/loadavg.h \
|
||||
termios.h \
|
||||
|
@ -1,8 +1,5 @@
|
||||
dnl Check for headers needed by timelib
|
||||
AC_CHECK_HEADERS([ \
|
||||
strings.h \
|
||||
io.h
|
||||
])
|
||||
AC_CHECK_HEADERS([io.h])
|
||||
|
||||
dnl Check for strtoll, atoll
|
||||
AC_CHECK_FUNCS(strtoll atoll)
|
||||
|
@ -92,8 +92,6 @@ if test "$PHP_OPCACHE" != "no"; then
|
||||
AC_DEFINE(HAVE_MPROTECT, 1, [Define if you have mprotect() function])
|
||||
])
|
||||
|
||||
AC_CHECK_HEADERS([unistd.h sys/uio.h])
|
||||
|
||||
AC_MSG_CHECKING(for sysvipc shared memory support)
|
||||
AC_RUN_IFELSE([AC_LANG_SOURCE([[
|
||||
#include <sys/types.h>
|
||||
|
@ -17,7 +17,7 @@ if test "$PHP_SOCKETS" != "no"; then
|
||||
fi
|
||||
|
||||
AC_CHECK_FUNCS([hstrerror socketpair if_nametoindex if_indextoname])
|
||||
AC_CHECK_HEADERS([netdb.h netinet/tcp.h sys/un.h sys/sockio.h])
|
||||
AC_CHECK_HEADERS([netinet/tcp.h sys/un.h sys/sockio.h])
|
||||
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
|
||||
#include <sys/types.h>
|
||||
#include <sys/socket.h>
|
||||
|
@ -448,7 +448,6 @@ AC_CHECK_HEADERS([net/if.h],[], [],
|
||||
#endif
|
||||
#include <net/if.h>
|
||||
])
|
||||
AC_CHECK_HEADERS([netdb.h])
|
||||
AC_MSG_CHECKING([for usable getifaddrs])
|
||||
AC_LINK_IFELSE([AC_LANG_PROGRAM([[
|
||||
#include <sys/types.h>
|
||||
|
@ -11,11 +11,6 @@ AC_DEFUN([AC_FPM_STDLIBS],
|
||||
|
||||
AC_SEARCH_LIBS(socket, socket)
|
||||
AC_SEARCH_LIBS(inet_addr, nsl)
|
||||
|
||||
AC_CHECK_HEADERS([fcntl.h unistd.h sys/uio.h])
|
||||
AC_CHECK_HEADERS([sys/select.h sys/socket.h sys/time.h])
|
||||
AC_CHECK_HEADERS([arpa/inet.h netinet/in.h])
|
||||
AC_CHECK_HEADERS([sysexits.h])
|
||||
])
|
||||
|
||||
AC_DEFUN([AC_FPM_PRCTL],
|
||||
|
Loading…
Reference in New Issue
Block a user