Skip to content

Commit

Permalink
Remove unused in_addr_t type alias (#12994)
Browse files Browse the repository at this point in the history
The fastcgi code was refactored in
18cf4e0 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.
  • Loading branch information
petk authored Jan 2, 2024
1 parent 85ffdef commit 3164a9e
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 25 deletions.
22 changes: 0 additions & 22 deletions build/php.m4
Original file line number Diff line number Diff line change
Expand Up @@ -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
<<in_addr_t[^a-zA-Z_0-9]>>dnl
changequote([,]), [#include <sys/types.h>
#include <stdlib.h>
#include <stddef.h>
#ifdef HAVE_NETINET_IN_H
#include <netinet/in.h>
#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
Expand Down
1 change: 0 additions & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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 <arm_acle.h>]],[[__crc32d(0, 0);]])],[ac_cv_func___crc32d=yes],[ac_cv_func___crc32d="no"])])
Expand Down
2 changes: 0 additions & 2 deletions main/fastcgi.c
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@

#include <windows.h>

typedef unsigned int in_addr_t;

struct sockaddr_un {
short sun_family;
char sun_path[MAXPATHLEN];
Expand Down

0 comments on commit 3164a9e

Please sign in to comment.