archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-7.4'

Browse source 
* PHP-7.4:
  Remove some unused variables
This commit is contained in:
Peter Kokot 2019-07-08 10:20:14 +02:00
commit c752b74665
3 changed files with 1 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
build/Makefile.global
View file

@ -80,7 +80,7 @@ PHP_TEST_SHARED_EXTENSIONS = ` \
fi; \ fi; \
if test "x$(PHP_ZEND_EX)" != "x"; then \ if test "x$(PHP_ZEND_EX)" != "x"; then \
for i in $(PHP_ZEND_EX)""; do \ for i in $(PHP_ZEND_EX)""; do \
. $$i; $(top_srcdir)/build/shtool echo -n -- " -d $(ZEND_EXT_TYPE)=$(top_builddir)/modules/$$dlname"; \ . $$i; $(top_srcdir)/build/shtool echo -n -- " -d zend_extension=$(top_builddir)/modules/$$dlname"; \
done; \ done; \
fi` fi`
PHP_DEPRECATED_DIRECTIVES_REGEX = '^(magic_quotes_(gpc|runtime|sybase)?|(zend_)?extension(_debug)?(_ts)?)[\t\ ]*=' PHP_DEPRECATED_DIRECTIVES_REGEX = '^(magic_quotes_(gpc|runtime|sybase)?|(zend_)?extension(_debug)?(_ts)?)[\t\ ]*='

8
configure.ac
View file

@ -165,9 +165,6 @@ test -z "$CFLAGS" && auto_cflags=1
abs_srcdir=`(cd $srcdir; pwd)` abs_srcdir=`(cd $srcdir; pwd)`
abs_builddir=`pwd` abs_builddir=`pwd`
php_abs_top_srcdir=$abs_srcdir
php_abs_top_builddir=$abs_builddir
dnl Because `make install` is often performed by the superuser, we create the dnl Because `make install` is often performed by the superuser, we create the
dnl libs subdirectory as the user who configures PHP. Otherwise, the current dnl libs subdirectory as the user who configures PHP. Otherwise, the current
dnl user will not be able to delete libs or the contents of libs. dnl user will not be able to delete libs or the contents of libs.
@ -1382,8 +1379,6 @@ PHP_SUBST(EXT_LIBS)
PHP_SUBST_OLD(abs_builddir) PHP_SUBST_OLD(abs_builddir)
PHP_SUBST_OLD(abs_srcdir) PHP_SUBST_OLD(abs_srcdir)
PHP_SUBST_OLD(php_abs_top_builddir)
PHP_SUBST_OLD(php_abs_top_srcdir)
PHP_SUBST(bindir) PHP_SUBST(bindir)
PHP_SUBST(sbindir) PHP_SUBST(sbindir)
@ -1459,9 +1454,6 @@ if test "$PHP_WERROR" = "yes"; then
CPPFLAGS="$CPPFLAGS -Werror" CPPFLAGS="$CPPFLAGS -Werror"
fi fi
ZEND_EXT_TYPE="zend_extension"
PHP_SUBST(ZEND_EXT_TYPE)
dnl dnl
dnl Libtool creation. dnl Libtool creation.
dnl dnl

4
scripts/phpize.m4
View file

@ -111,10 +111,6 @@ php_zts_is_enabled
CPPFLAGS=$old_CPPFLAGS CPPFLAGS=$old_CPPFLAGS
AC_MSG_RESULT([$PHP_THREAD_SAFETY]) AC_MSG_RESULT([$PHP_THREAD_SAFETY])
dnl Support for building and testing Zend extensions.
ZEND_EXT_TYPE="zend_extension"
PHP_SUBST(ZEND_EXT_TYPE)
dnl Discard optimization flags when debugging is enabled. dnl Discard optimization flags when debugging is enabled.
if test "$PHP_DEBUG" = "yes"; then if test "$PHP_DEBUG" = "yes"; then
PHP_DEBUG=1 PHP_DEBUG=1