From 3164a9effbd0d4bdb4a01d78aee97f8bac46588e Mon Sep 17 00:00:00 2001 From: Peter Kokot Date: Tue, 2 Jan 2024 07:41:33 -0800 Subject: [PATCH] Remove unused in_addr_t type alias (#12994) The fastcgi code was refactored in 18cf4e0a8a574034f60f4d123407c173e57e54ec and in_addr_t is no longer used. The PHP_CHECK_IN_ADDR_T is also obsolete and not recommended way to discover availability of the type. If needed in the future, the AC_CHECK_TYPES can be used instead. --- build/php.m4 | 22 ---------------------- configure.ac | 1 - main/fastcgi.c | 2 -- 3 files changed, 25 deletions(-) diff --git a/build/php.m4 b/build/php.m4 index 0e75a86cfc5..345e05c06d3 100644 --- a/build/php.m4 +++ b/build/php.m4 @@ -1069,28 +1069,6 @@ AC_DEFUN([PHP_CHECK_SIZEOF], [ AC_MSG_RESULT([[$][php_cv_sizeof_]translit($1, ,_)]) ]) -dnl -dnl PHP_CHECK_IN_ADDR_T -dnl -AC_DEFUN([PHP_CHECK_IN_ADDR_T], [ -dnl AIX keeps in_addr_t in /usr/include/netinet/in.h -AC_MSG_CHECKING([for in_addr_t]) -AC_CACHE_VAL(ac_cv_type_in_addr_t, -[AC_EGREP_CPP(dnl -changequote(<<,>>)dnl -<>dnl -changequote([,]), [#include -#include -#include -#ifdef HAVE_NETINET_IN_H -#include -#endif], ac_cv_type_in_addr_t=yes, ac_cv_type_in_addr_t=no)])dnl -AC_MSG_RESULT([$ac_cv_type_in_addr_t]) -if test $ac_cv_type_in_addr_t = no; then - AC_DEFINE(in_addr_t, u_int, [ ]) -fi -]) - dnl dnl PHP_TIME_R_TYPE dnl diff --git a/configure.ac b/configure.ac index 6bd514236a6..d00c199018a 100644 --- a/configure.ac +++ b/configure.ac @@ -752,7 +752,6 @@ fi AC_REPLACE_FUNCS(strlcat strlcpy explicit_bzero getopt) AC_FUNC_ALLOCA PHP_TIME_R_TYPE -PHP_CHECK_IN_ADDR_T AC_CACHE_CHECK([for aarch64 CRC32 API], ac_cv_func___crc32d, [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]],[[__crc32d(0, 0);]])],[ac_cv_func___crc32d=yes],[ac_cv_func___crc32d="no"])]) diff --git a/main/fastcgi.c b/main/fastcgi.c index cf734ac24ac..0e05f7c3b51 100644 --- a/main/fastcgi.c +++ b/main/fastcgi.c @@ -31,8 +31,6 @@ #include -typedef unsigned int in_addr_t; - struct sockaddr_un { short sun_family; char sun_path[MAXPATHLEN];