diff options
| author | Stanislav Malyshev <stas@php.net> | 2013-08-04 16:07:13 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2013-08-04 16:07:13 -0700 |
| commit | 68e8326e0ea5db3bf4dc5cc0f50b56a4a8f4e5ce (patch) | |
| tree | 8fe70eda03310fcc56c100bfad951741fd5565aa /ext/date | |
| parent | c620a51a3249c0b8ff3943bceb91c6fb7cc1dd4a (diff) | |
| parent | c793a6569013f9ab46f2cd7331cc1a04aa42cbed (diff) | |
| download | php-git-68e8326e0ea5db3bf4dc5cc0f50b56a4a8f4e5ce.tar.gz | |
Merge branch 'PHP-5.5'
* PHP-5.5:
non living code related typo fixes
Diffstat (limited to 'ext/date')
| -rw-r--r-- | ext/date/php_date.c | 2 | ||||
| -rw-r--r-- | ext/date/php_date.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ext/date/php_date.c b/ext/date/php_date.c index 0f8822a906..013f3910c9 100644 --- a/ext/date/php_date.c +++ b/ext/date/php_date.c @@ -1396,7 +1396,7 @@ PHPAPI void php_date_set_tzdb(timelib_tzdb *tzdb) } /* }}} */ -/* {{{ php_parse_date: Backwards compability function */ +/* {{{ php_parse_date: Backwards compatibility function */ PHPAPI signed long php_parse_date(char *string, signed long *now) { timelib_time *parsed_time; diff --git a/ext/date/php_date.h b/ext/date/php_date.h index 725590136c..536629a25f 100644 --- a/ext/date/php_date.h +++ b/ext/date/php_date.h @@ -182,7 +182,7 @@ ZEND_END_MODULE_GLOBALS(date) #define DATEG(v) (date_globals.v) #endif -/* Backwards compability wrapper */ +/* Backwards compatibility wrapper */ PHPAPI signed long php_parse_date(char *string, signed long *now); PHPAPI void php_mktime(INTERNAL_FUNCTION_PARAMETERS, int gmt); PHPAPI int php_idate(char format, time_t ts, int localtime TSRMLS_DC); |