]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of git.php.net:php-src
authorDmitry Stogov <dmitry@zend.com>
Thu, 11 Apr 2019 10:26:47 +0000 (13:26 +0300)
committerDmitry Stogov <dmitry@zend.com>
Thu, 11 Apr 2019 10:26:47 +0000 (13:26 +0300)
* 'master' of git.php.net:php-src:
  Use zend_quiet_write instead of ZEND_IGNORE_VALUE
  Suppress warnings using zend_quiet_write
  Don't build JIT if the host architecture doesn't support it
  Fix incompatible pointer warning in zend_test
  Mark zend_jit_print_regset as unused
  Suppress write() warnings in jit_perf_dump.c
  Generate ZEND_COUNT for sizeof()
  Make tsrm_env_lock() void

1  2 
Zend/zend_vm_def.h
Zend/zend_vm_execute.h

Simple merge
Simple merge