diff options
| author | Joe Watkins <krakjoe@php.net> | 2019-06-19 09:00:00 +0200 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2019-06-19 09:01:20 +0200 |
| commit | fb95043acf19b1f3784c9131a7b77df78bf4acec (patch) | |
| tree | 11fddb58412b404ec70e5329e47039c60fd48c7b /ext/date/php_date.h | |
| parent | 5a1ffefbc19cdb6cd7f9b29f620e621295ccb446 (diff) | |
| parent | 025899e3b53e47cae9c1da4077988577b57e4b15 (diff) | |
| download | php-git-fb95043acf19b1f3784c9131a7b77df78bf4acec.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Resolve discrepencies between second value yielded by gettimeofday and time, fixes #69044
Diffstat (limited to 'ext/date/php_date.h')
| -rw-r--r-- | ext/date/php_date.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/date/php_date.h b/ext/date/php_date.h index 8bb6f23ea1..009be83a3f 100644 --- a/ext/date/php_date.h +++ b/ext/date/php_date.h @@ -197,6 +197,8 @@ ZEND_END_MODULE_GLOBALS(date) #define DATEG(v) ZEND_MODULE_GLOBALS_ACCESSOR(date, v) +PHPAPI time_t php_time(); + /* Backwards compatibility wrapper */ PHPAPI zend_long php_parse_date(char *string, zend_long *now); PHPAPI void php_mktime(INTERNAL_FUNCTION_PARAMETERS, int gmt); |