diff options
author | Joe Watkins <krakjoe@php.net> | 2019-06-19 12:40:23 +0200 |
---|---|---|
committer | Joe Watkins <krakjoe@php.net> | 2019-06-19 12:40:23 +0200 |
commit | 264536877dd63a8cee0175e636fdec8046e305c0 (patch) | |
tree | 877e0876a204484d17a241a483dd5a185e21bab8 /ext/date | |
parent | 025899e3b53e47cae9c1da4077988577b57e4b15 (diff) | |
parent | 599b94ff14e9de2acd871b7db17e70e6c84dbe2b (diff) | |
download | php-git-264536877dd63a8cee0175e636fdec8046e305c0.tar.gz |
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
export php_time
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, 3 insertions, 1 deletions
diff --git a/ext/date/php_date.c b/ext/date/php_date.c index dfe49d2ab4..d3fa0ddd41 100644 --- a/ext/date/php_date.c +++ b/ext/date/php_date.c @@ -60,7 +60,7 @@ static inline long long php_date_llabs( long long i ) { return i >= 0 ? i : -i; #endif #endif -static time_t php_time() +PHPAPI time_t php_time() { #ifdef HAVE_GETTIMEOFDAY struct timeval tm; diff --git a/ext/date/php_date.h b/ext/date/php_date.h index 691521dfa6..00e2c385f2 100644 --- a/ext/date/php_date.h +++ b/ext/date/php_date.h @@ -204,6 +204,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); |