]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of https://git.php.net/repository/php-src
authorChristopher Jones <sixd@php.net>
Fri, 13 Sep 2013 18:20:38 +0000 (11:20 -0700)
committerChristopher Jones <sixd@php.net>
Fri, 13 Sep 2013 18:20:38 +0000 (11:20 -0700)
* 'master' of https://git.php.net/repository/php-src:
  Fix two warnings
  Provide more macros for handling of interned strings
  Make use of Z_*VAL and ZVAL_* in language scanner
  Make consistent use of Z_*VAL macros in compiler


Trivial merge