diff options
| author | Jakub Zelenka <bukka@php.net> | 2015-02-02 19:53:32 +0000 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2015-02-02 19:53:32 +0000 |
| commit | 3e4c1717ee4f4beb9c362942a113b90fff0a7fb0 (patch) | |
| tree | f5da1649f6cfb5ae06b09b9cab4fd19a4446a767 /ext/date/php_date.c | |
| parent | b65205028a2debc50c3e2ca1572da4c74ac87834 (diff) | |
| parent | 92576c7c49a3c104bc4aea4cfa378a029bb26c86 (diff) | |
| download | php-git-3e4c1717ee4f4beb9c362942a113b90fff0a7fb0.tar.gz | |
Merge branch 'master' into jsond
Diffstat (limited to 'ext/date/php_date.c')
| -rw-r--r-- | ext/date/php_date.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/date/php_date.c b/ext/date/php_date.c index c6db35b709..a00c4c5a94 100644 --- a/ext/date/php_date.c +++ b/ext/date/php_date.c @@ -1441,7 +1441,7 @@ PHPAPI zend_long php_parse_date(char *string, zend_long *now) Convert string representation of date and time to a timestamp */ PHP_FUNCTION(strtotime) { - char *times, *initial_ts; + char *times; size_t time_len; int error1, error2; struct timelib_error_container *error; |