summaryrefslogtreecommitdiff
path: root/main/php.h
diff options
context:
space:
mode:
authorYasuo Ohgaki <yohgaki@php.net>2014-02-13 11:56:54 +0900
committerYasuo Ohgaki <yohgaki@php.net>2014-02-13 11:56:54 +0900
commit9a5cb51ebcb778b0cac39928fb6fcd5c604fe6cd (patch)
tree196bec3fad7cd0e8f2a26bc298b803d2383d0f58 /main/php.h
parentc9e9151bb3c5bc2e257a9e23d53b6f0234aac743 (diff)
parentcbd108abf19d9fb9ae1d4ccd153215f56a2763e8 (diff)
downloadphp-git-9a5cb51ebcb778b0cac39928fb6fcd5c604fe6cd.tar.gz
Merge branch 'PHP-5.6'
* PHP-5.6: Implement RFC https://wiki.php.net/rfc/default_encoding
Diffstat (limited to 'main/php.h')
-rw-r--r--main/php.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/main/php.h b/main/php.h
index c2d0d936ca..f9cfd2d7f2 100644
--- a/main/php.h
+++ b/main/php.h
@@ -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"