]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorNikita Popov <nikita.ppv@gmail.com>
Fri, 12 Apr 2019 10:51:42 +0000 (12:51 +0200)
committerNikita Popov <nikita.ppv@gmail.com>
Fri, 12 Apr 2019 10:51:42 +0000 (12:51 +0200)
1  2 
Zend/Zend.m4
ext/soap/soap.c

diff --cc Zend/Zend.m4
index 36bf116042e491b5b965be19d41024442a7a01d4,44cdcee71e470d58c48eb88389606ac3c4a720db..9aa68220ef235644d8c7b242f9dfcf0f14b0b34e
@@@ -108,9 -107,10 +107,10 @@@ els
    AC_DEFINE(ZEND_DEBUG,0,[ ])
  fi
  
+ test -n "$GCC" && CFLAGS="$CFLAGS -Wall"
  test -n "$DEBUG_CFLAGS" && CFLAGS="$CFLAGS $DEBUG_CFLAGS"
  
 -if test "$ZEND_MAINTAINER_ZTS" = "yes"; then
 +if test "$ZEND_ZTS" = "yes"; then
    AC_DEFINE(ZTS,1,[ ])
    CFLAGS="$CFLAGS -DZTS"
  fi
diff --cc ext/soap/soap.c
Simple merge