mirror of
https://github.com/php/php-src.git
synced 2024-12-24 17:30:48 +08:00
Merge branch 'PHP-7.4'
* PHP-7.4: Remove PHP_DECLARED_TIMEZONE and HAVE_DECLARED_TIMEZONE
This commit is contained in:
commit
f1b8c30174
23
acinclude.m4
23
acinclude.m4
@ -1460,29 +1460,6 @@ AC_DEFUN([PHP_SOCKADDR_CHECKS], [
|
||||
fi
|
||||
])
|
||||
|
||||
dnl
|
||||
dnl PHP_DECLARED_TIMEZONE
|
||||
dnl
|
||||
AC_DEFUN([PHP_DECLARED_TIMEZONE],[
|
||||
AC_CACHE_CHECK(for declared timezone, ac_cv_declared_timezone,[
|
||||
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
|
||||
#include <sys/types.h>
|
||||
#include <time.h>
|
||||
#ifdef HAVE_SYS_TIME_H
|
||||
#include <sys/time.h>
|
||||
#endif
|
||||
]],[[
|
||||
time_t foo = (time_t) timezone;
|
||||
]])],[
|
||||
ac_cv_declared_timezone=yes
|
||||
],[
|
||||
ac_cv_declared_timezone=no
|
||||
])])
|
||||
if test "$ac_cv_declared_timezone" = "yes"; then
|
||||
AC_DEFINE(HAVE_DECLARED_TIMEZONE, 1, [Whether system headers declare timezone])
|
||||
fi
|
||||
])
|
||||
|
||||
dnl
|
||||
dnl PHP_EBCDIC
|
||||
dnl
|
||||
|
@ -734,7 +734,6 @@ fi
|
||||
|
||||
AC_REPLACE_FUNCS(strlcat strlcpy explicit_bzero getopt)
|
||||
AC_FUNC_ALLOCA
|
||||
PHP_DECLARED_TIMEZONE
|
||||
PHP_TIME_R_TYPE
|
||||
PHP_READDIR_R_TYPE
|
||||
PHP_CHECK_IN_ADDR_T
|
||||
|
@ -80,7 +80,6 @@
|
||||
/* Windows specific defines */
|
||||
#ifdef PHP_WIN32
|
||||
# define PHP_PROG_SENDMAIL "Built in mailer"
|
||||
# define HAVE_DECLARED_TIMEZONE
|
||||
# define WIN32_LEAN_AND_MEAN
|
||||
# define NOOPENFILE
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user