Skip to content

Commit

Permalink
Remove LIBZEND_CHECK_INT_TYPE and PHP_CHECK_TYPES
Browse files Browse the repository at this point in the history
Checking for int32_t and uint32_t types is already done by the
PHP_CHECK_STDINT_TYPES m4 macro.

The PHP_CHECK_TYPES m4 macro has been once used by the mysqlnd and has
been removed via 14caf17 and
additionally, the internal unused macro _PHP_DEF_HAVE_FILE has been
removed.

Additionally, the unused PHP_HAVE_STDINT_TYPES symbol has been removed.
  • Loading branch information
petk committed Mar 2, 2019
1 parent 220e682 commit 7431eb7
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 48 deletions.
26 changes: 0 additions & 26 deletions Zend/Zend.m4
Expand Up @@ -2,28 +2,6 @@ dnl
dnl This file contains Zend specific autoconf functions.
dnl

AC_DEFUN([LIBZEND_CHECK_INT_TYPE],[
AC_MSG_CHECKING(for $1)
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#if HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#if HAVE_INTTYPES_H
#include <inttypes.h>
#elif HAVE_STDINT_H
#include <stdint.h>
#endif]],
[[if (($1 *) 0)
return 0;
if (sizeof ($1))
return 0;
]])],[
AC_DEFINE_UNQUOTED([HAVE_]translit($1,a-z_-,A-Z__), 1,[Define if $1 type is present. ])
AC_MSG_RESULT(yes)
], [AC_MSG_RESULT(no)
])dnl
])

AC_DEFUN([LIBZEND_BASIC_CHECKS],[
AC_REQUIRE([AC_PROG_YACC])
Expand Down Expand Up @@ -72,10 +50,6 @@ dnl This is required for QNX and may be some BSD derived systems
AC_CHECK_TYPE( uint, unsigned int )
AC_CHECK_TYPE( ulong, unsigned long )
dnl Check if int32_t and uint32_t are defined
LIBZEND_CHECK_INT_TYPE(int32_t)
LIBZEND_CHECK_INT_TYPE(uint32_t)
dnl Checks for library functions.
AC_FUNC_ALLOCA
AC_CHECK_FUNCS(strdup getpid kill strtod strtol finite fpclass sigsetjmp)
Expand Down
22 changes: 0 additions & 22 deletions acinclude.m4
Expand Up @@ -1014,12 +1014,6 @@ dnl -------------------------------------------------------------------------

dnl Internal helper macros
dnl
dnl _PHP_DEF_HAVE_FILE(what, filename)
AC_DEFUN([_PHP_DEF_HAVE_FILE], [
php_def_have_what=HAVE_[]`echo $1 | tr 'abcdefghijklmnopqrstuvwxyz-' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_' `
echo "#define $php_def_have_what 1" >> $2
])
dnl
dnl _PHP_CHECK_SIZEOF(type, cross-value, extra-headers [, found-action [, not-found-action]])
dnl
AC_DEFUN([_PHP_CHECK_SIZEOF], [
Expand Down Expand Up @@ -1075,21 +1069,6 @@ AC_DEFUN([PHP_CHECK_SIZEOF], [
AC_MSG_RESULT([[$][php_cv_sizeof_]translit($1, ,_)])
])

dnl
dnl PHP_CHECK_TYPES(type-list, include-file [, extra-headers])
dnl
AC_DEFUN([PHP_CHECK_TYPES], [
for php_typename in $1; do
AC_MSG_CHECKING([whether $php_typename exists])
_PHP_CHECK_SIZEOF($php_typename, 0, $3, [
_PHP_DEF_HAVE_FILE($php_typename, $2)
AC_MSG_RESULT([yes])
], [
AC_MSG_RESULT([no])
])
done
])

dnl
dnl PHP_CHECK_IN_ADDR_T
dnl
Expand Down Expand Up @@ -2652,7 +2631,6 @@ AC_DEFUN([PHP_CHECK_STDINT_TYPES], [
# include <sys/types.h>
#endif
])
AC_DEFINE([PHP_HAVE_STDINT_TYPES], [1], [Checked for stdint types])
])

dnl PHP_CHECK_BUILTIN_EXPECT
Expand Down

0 comments on commit 7431eb7

Please sign in to comment.