Merge branch 'PHP-5.6'

* PHP-5.6:
  Implement RFC https://wiki.php.net/rfc/default_encoding
This commit is contained in:
Yasuo Ohgaki 2014-02-13 11:56:54 +09:00
commit 9a5cb51ebc
34 changed files with 464 additions and 161 deletions

View file

@ -29,6 +29,7 @@
#define PHP_API_VERSION 20131218
#define PHP_HAVE_STREAMS
#define YYDEBUG 0
#define PHP_DEFAULT_CHARSET "UTF-8"
#include "php_version.h"
#include "zend.h"