Skip to content

Clean duplicate headers check #12710

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 18, 2023
Merged

Clean duplicate headers check #12710

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,6 @@ netinet/in.h \
alloca.h \
arpa/inet.h \
arpa/nameser.h \
crypt.h \
dns.h \
fcntl.h \
grp.h \
Expand Down Expand Up @@ -666,7 +665,6 @@ dnl getaddrinfo.
AC_CACHE_CHECK([for getaddrinfo], ac_cv_func_getaddrinfo,
[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <netdb.h>]],
[[struct addrinfo *g,h;g=&h;getaddrinfo("","",g,&g);]])],[AC_RUN_IFELSE([AC_LANG_SOURCE([[
#include <string.h>
#include <netdb.h>
#include <sys/types.h>
#include <string.h>
Expand Down
17 changes: 3 additions & 14 deletions ext/standard/config.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,6 @@ if test "$PHP_EXTERNAL_LIBCRYPT" != "no"; then

AC_CACHE_CHECK(for standard DES crypt, ac_cv_crypt_des,[
AC_RUN_IFELSE([AC_LANG_SOURCE([[
#include <string.h>

#if HAVE_UNISTD_H
#include <unistd.h>
#endif
Expand Down Expand Up @@ -98,8 +96,6 @@ int main(void) {

AC_CACHE_CHECK(for extended DES crypt, ac_cv_crypt_ext_des,[
AC_RUN_IFELSE([AC_LANG_SOURCE([[
#include <string.h>

#if HAVE_UNISTD_H
#include <unistd.h>
#endif
Expand Down Expand Up @@ -128,8 +124,6 @@ int main(void) {

AC_CACHE_CHECK(for MD5 crypt, ac_cv_crypt_md5,[
AC_RUN_IFELSE([AC_LANG_SOURCE([[
#include <string.h>

#if HAVE_UNISTD_H
#include <unistd.h>
#endif
Expand Down Expand Up @@ -168,8 +162,6 @@ int main(void) {

AC_CACHE_CHECK(for Blowfish crypt, ac_cv_crypt_blowfish,[
AC_RUN_IFELSE([AC_LANG_SOURCE([[
#include <string.h>

#if HAVE_UNISTD_H
#include <unistd.h>
#endif
Expand Down Expand Up @@ -205,8 +197,6 @@ int main(void) {

AC_CACHE_CHECK(for SHA512 crypt, ac_cv_crypt_sha512,[
AC_RUN_IFELSE([AC_LANG_SOURCE([[
#include <string.h>

#if HAVE_UNISTD_H
#include <unistd.h>
#endif
Expand Down Expand Up @@ -241,8 +231,6 @@ int main(void) {

AC_CACHE_CHECK(for SHA256 crypt, ac_cv_crypt_sha256,[
AC_RUN_IFELSE([AC_LANG_SOURCE([[
#include <string.h>

#if HAVE_UNISTD_H
#include <unistd.h>
#endif
Expand Down Expand Up @@ -417,15 +405,16 @@ if test "$PHP_PASSWORD_ARGON2" != "no"; then
fi

dnl
dnl net_get_interfaces
dnl Check net/if.h for net_get_interfaces. Darwin and BSD-like systems need
dnl sys/socket.h to be included with net/if.h.
dnl
AC_CHECK_HEADERS([net/if.h],[], [],
[
#ifdef HAVE_SYS_SOCKET_H
#include <sys/socket.h>
#endif
#include <net/if.h>
])

AC_MSG_CHECKING([for usable getifaddrs])
AC_LINK_IFELSE([AC_LANG_PROGRAM([[
#include <sys/types.h>
Expand Down