diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-11-07 14:42:11 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-11-07 14:42:11 +0100 |
| commit | 6ddb381ae5b6f6063d5d8295c3ed8da9a0383562 (patch) | |
| tree | a0f1a47104fde866b793e6982b5eb6c168d3641c | |
| parent | e19f0e86dc4ed3395595ca87b02d2d62389c4ee0 (diff) | |
| parent | b9dfa12853c0f43ce76221d54cfd0568f674bac1 (diff) | |
| download | php-git-6ddb381ae5b6f6063d5d8295c3ed8da9a0383562.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Wrap hrtime in `extern "c" {}`
| -rw-r--r-- | ext/standard/hrtime.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/ext/standard/hrtime.h b/ext/standard/hrtime.h index 2fef187c9a..6f6b30e41a 100644 --- a/ext/standard/hrtime.h +++ b/ext/standard/hrtime.h @@ -20,6 +20,8 @@ #ifndef HRTIME_H #define HRTIME_H +#include <Zend/zend_portability.h> + #define PHP_HRTIME_PLATFORM_POSIX 0 #define PHP_HRTIME_PLATFORM_WINDOWS 0 #define PHP_HRTIME_PLATFORM_APPLE 0 @@ -45,6 +47,8 @@ #define HRTIME_AVAILABLE (PHP_HRTIME_PLATFORM_POSIX || PHP_HRTIME_PLATFORM_WINDOWS || PHP_HRTIME_PLATFORM_APPLE || PHP_HRTIME_PLATFORM_HPUX || PHP_HRTIME_PLATFORM_AIX) +BEGIN_EXTERN_C() + typedef uint64_t php_hrtime_t; PHPAPI php_hrtime_t php_hrtime_current(void); @@ -53,4 +57,6 @@ PHP_MINIT_FUNCTION(hrtime); PHP_FUNCTION(hrtime); +END_EXTERN_C() + #endif /* HRTIME_H */ |