diff options
| author | Derick Rethans <github@derickrethans.nl> | 2014-02-11 11:31:06 +0000 |
|---|---|---|
| committer | Derick Rethans <github@derickrethans.nl> | 2014-02-11 11:31:06 +0000 |
| commit | 75f59e148c34a5125876dba8769adb9a132bd6b7 (patch) | |
| tree | 17d6a7fe9308bac753bb9bbb5c7aecc44123737e | |
| parent | 9fa6bcd8cb0acfdcdf4dc44720c5c267e2aa2f60 (diff) | |
| parent | 39e721cf50276e5872e445b36fefdc4eb80cdcf7 (diff) | |
| download | php-git-75f59e148c34a5125876dba8769adb9a132bd6b7.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
| -rw-r--r-- | ext/date/php_date.c | 2 | ||||
| -rw-r--r-- | ext/standard/html_tables/html_table_gen.php | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/ext/date/php_date.c b/ext/date/php_date.c index a61d9db3c1..f6b12bc42e 100644 --- a/ext/date/php_date.c +++ b/ext/date/php_date.c @@ -3638,7 +3638,7 @@ static int timezone_initialize(php_timezone_obj *tzobj, /*const*/ char *tz TSRML efree(dummy_t); return FAILURE; } else { - set_timezone_from_timelib_time(tzobj, dummy_t TSRMLS_CC); + set_timezone_from_timelib_time(tzobj, dummy_t); efree(dummy_t); return SUCCESS; } diff --git a/ext/standard/html_tables/html_table_gen.php b/ext/standard/html_tables/html_table_gen.php index 7e7314fa35..68dec133f5 100644 --- a/ext/standard/html_tables/html_table_gen.php +++ b/ext/standard/html_tables/html_table_gen.php @@ -80,8 +80,11 @@ static const struct { { "Shift_JIS", cs_sjis }, { "SJIS", cs_sjis }, { "932", cs_sjis }, + { "SJIS-win", cs_sjis }, + { "CP932", cs_sjis }, { "EUCJP", cs_eucjp }, { "EUC-JP", cs_eucjp }, + { "eucJP-win", cs_eucjp }, { "KOI8-R", cs_koi8r }, { "koi8-ru", cs_koi8r }, { "koi8r", cs_koi8r }, |