diff options
| author | Derick Rethans <github@derickrethans.nl> | 2014-01-26 14:02:37 +0100 |
|---|---|---|
| committer | Derick Rethans <github@derickrethans.nl> | 2014-01-26 14:02:37 +0100 |
| commit | 7399386a2094ccce9b5deb0c035ff6ac2aa7eb8b (patch) | |
| tree | 6bbccc8335fa1fe2d7103d2d2a8ddbaa6925c292 /ext/date/php_date.h | |
| parent | ce1e1bb5d83bd1a94f50b24ba0b884e314264fe6 (diff) | |
| parent | 251b914afa66a6ae575e16ae4ab2faf39655edba (diff) | |
| download | php-git-7399386a2094ccce9b5deb0c035ff6ac2aa7eb8b.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
Diffstat (limited to 'ext/date/php_date.h')
| -rw-r--r-- | ext/date/php_date.h | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/ext/date/php_date.h b/ext/date/php_date.h index d4204ebd79..d7343e02bc 100644 --- a/ext/date/php_date.h +++ b/ext/date/php_date.h @@ -137,14 +137,9 @@ struct _php_timezone_obj { int initialized; int type; union { - timelib_tzinfo *tz; /* TIMELIB_ZONETYPE_ID; */ - timelib_sll utc_offset; /* TIMELIB_ZONETYPE_OFFSET */ - struct /* TIMELIB_ZONETYPE_ABBR */ - { - timelib_sll utc_offset; - char *abbr; - int dst; - } z; + timelib_tzinfo *tz; /* TIMELIB_ZONETYPE_ID */ + timelib_sll utc_offset; /* TIMELIB_ZONETYPE_OFFSET */ + timelib_abbr_info z; /* TIMELIB_ZONETYPE_ABBR */ } tzi; HashTable *props; }; |