From: Peter Kokot Date: Fri, 28 Jun 2019 21:10:37 +0000 (+0200) Subject: Sync functions checks X-Git-Tag: php-7.4.0alpha3~110 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9a3c8e51e3ee33a4f9a414f79af09489273e0b92;p=php Sync functions checks Removed unused checks: - mbsinit check removed, HAVE_MBSINIT removed (not used in php-src) - mempcpy check removed, HAVE_MEMPCPY removed (not used in php-src anymore since 560ed89bfbb56526251e9bd2fbcb27e5932641d8 which uses PHP's own implementation) - strpncpy check removed, added via a8c9e893b6911c785f698d724b2ff61e7aebb737 and not used. - setpgid check removed since HAVE_SETPGID is not used Moved to a central configure.ac: - fpclass - mbrlen moved to configure.ac (since the HAVE_MBRLEN is used accross the php-src) - sigprocmask - getcwd - getwd - glob - strfmon - nice Duplicated checks removed: - gethostname - getlogin - getpwuid_r - socketpair - mprotect check simplified --- diff --git a/TSRM/tsrm.m4 b/TSRM/tsrm.m4 index f269abf8a6..9caad3ab65 100644 --- a/TSRM/tsrm.m4 +++ b/TSRM/tsrm.m4 @@ -6,8 +6,6 @@ dnl AC_DEFUN([TSRM_BASIC_CHECKS],[ AC_REQUIRE([AC_PROG_CC])dnl AC_REQUIRE([AC_PROG_RANLIB])dnl - -AC_CHECK_FUNCS(sigprocmask) ]) dnl diff --git a/Zend/Zend.m4 b/Zend/Zend.m4 index 85523237ed..be45a5c600 100644 --- a/Zend/Zend.m4 +++ b/Zend/Zend.m4 @@ -146,7 +146,7 @@ _LT_AC_TRY_DLOPEN_SELF([ ]) dnl Checks for library functions. -AC_CHECK_FUNCS(getpid kill finite fpclass sigsetjmp) +AC_CHECK_FUNCS(getpid kill finite sigsetjmp) AC_CHECK_DECLS([isfinite, isnan, isinf], [], [], [[#include ]]) diff --git a/configure.ac b/configure.ac index eeb806f639..5a230200ca 100644 --- a/configure.ac +++ b/configure.ac @@ -592,23 +592,26 @@ cuserid \ crypt \ explicit_memset \ flock \ +fpclass \ ftok \ funopen \ gai_strerror \ gcvt \ +getcwd \ getloadavg \ getlogin \ getprotobyname \ getprotobynumber \ getservbyname \ getservbyport \ -gethostname \ getrusage \ gettimeofday \ gmtime_r \ getpwnam_r \ getgrnam_r \ getpwuid_r \ +getwd \ +glob \ grantpt \ inet_ntoa \ inet_ntop \ @@ -619,9 +622,11 @@ localtime_r \ lockf \ lchown \ lrand48 \ +mbrlen \ memmove \ mkstemp \ mmap \ +nice \ nl_langinfo \ poll \ ptsname \ @@ -632,10 +637,10 @@ rand_r \ scandir \ setitimer \ setenv \ -setpgid \ setsockopt \ setvbuf \ shutdown \ +sigprocmask \ sin \ srand48 \ srandom \ @@ -645,6 +650,7 @@ std_syslog \ strcasecmp \ strdup \ strerror \ +strfmon \ strnlen \ strptime \ strtok_r \ diff --git a/ext/opcache/config.m4 b/ext/opcache/config.m4 index dc32c5b94f..6355f206a5 100644 --- a/ext/opcache/config.m4 +++ b/ext/opcache/config.m4 @@ -17,9 +17,7 @@ if test "$PHP_OPCACHE" != "no"; then AC_DEFINE(HAVE_HUGE_CODE_PAGES, 1, [Define to enable copying PHP CODE pages into HUGE PAGES (experimental)]) fi - AC_CHECK_FUNC(mprotect,[ - AC_DEFINE(HAVE_MPROTECT, 1, [Define if you have mprotect() function]) - ]) + AC_CHECK_FUNCS([mprotect]) AC_MSG_CHECKING(for sysvipc shared memory support) AC_RUN_IFELSE([AC_LANG_SOURCE([[ diff --git a/ext/pcntl/config.m4 b/ext/pcntl/config.m4 index bf7f3064b4..9b6957230d 100644 --- a/ext/pcntl/config.m4 +++ b/ext/pcntl/config.m4 @@ -7,7 +7,7 @@ if test "$PHP_PCNTL" != "no"; then AC_CHECK_FUNCS(fork, [ AC_DEFINE(HAVE_FORK,1,[ ]) ], [ AC_MSG_ERROR(pcntl: fork() not supported by this platform) ]) AC_CHECK_FUNCS(waitpid, [ AC_DEFINE(HAVE_WAITPID,1,[ ]) ], [ AC_MSG_ERROR(pcntl: waitpid() not supported by this platform) ]) AC_CHECK_FUNCS(sigaction, [ AC_DEFINE(HAVE_SIGACTION,1,[ ]) ], [ AC_MSG_ERROR(pcntl: sigaction() not supported by this platform) ]) - AC_CHECK_FUNCS([getpriority setpriority wait3 wait4 sigprocmask sigwaitinfo sigtimedwait unshare]) + AC_CHECK_FUNCS([getpriority setpriority wait3 wait4 sigwaitinfo sigtimedwait unshare]) AC_MSG_CHECKING([for siginfo_t]) AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ diff --git a/ext/posix/config.m4 b/ext/posix/config.m4 index 9beea518be..e91041188a 100644 --- a/ext/posix/config.m4 +++ b/ext/posix/config.m4 @@ -10,7 +10,7 @@ if test "$PHP_POSIX" = "yes"; then AC_CHECK_HEADERS([sys/mkdev.h sys/sysmacros.h]) - AC_CHECK_FUNCS(seteuid setegid setsid getsid setpgid getpgid ctermid mkfifo mknod setrlimit getrlimit getlogin getgroups makedev initgroups getpwuid_r getgrgid_r) + AC_CHECK_FUNCS(seteuid setegid setsid getsid getpgid ctermid mkfifo mknod setrlimit getrlimit getgroups makedev initgroups getgrgid_r) AC_MSG_CHECKING([for working ttyname_r() implementation]) AC_RUN_IFELSE([AC_LANG_SOURCE([[ diff --git a/ext/sockets/config.m4 b/ext/sockets/config.m4 index 71cebdb3e2..6f5b5ba29f 100644 --- a/ext/sockets/config.m4 +++ b/ext/sockets/config.m4 @@ -16,7 +16,7 @@ if test "$PHP_SOCKETS" != "no"; then AC_DEFINE(HAVE_CMSGHDR,1,[Whether you have struct cmsghdr]) fi - AC_CHECK_FUNCS([hstrerror socketpair if_nametoindex if_indextoname]) + AC_CHECK_FUNCS([hstrerror if_nametoindex if_indextoname]) AC_CHECK_HEADERS([netinet/tcp.h sys/un.h sys/sockio.h]) AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include diff --git a/ext/standard/config.m4 b/ext/standard/config.m4 index b0ec90900b..9f85ec2b70 100644 --- a/ext/standard/config.m4 +++ b/ext/standard/config.m4 @@ -286,7 +286,7 @@ dnl Check for available functions dnl dnl log2 could be used to improve the log function, however it requires C99. The dnl check for log2 should be turned on, as soon as we support C99. -AC_CHECK_FUNCS(getcwd getwd asinh acosh atanh log1p hypot glob strfmon nice fpclass mempcpy strpncpy) +AC_CHECK_FUNCS(asinh acosh atanh log1p hypot) AC_FUNC_FNMATCH dnl @@ -376,7 +376,7 @@ dnl dnl Check for i18n capabilities dnl AC_CHECK_HEADERS([wchar.h]) -AC_CHECK_FUNCS([mblen mbrlen mbsinit]) +AC_CHECK_FUNCS([mblen]) AC_CACHE_CHECK([for mbstate_t], [ac_cv_type_mbstate_t],[ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #ifdef HAVE_WCHAR_H