diff options
| author | Levi Morrison <levi.morrison@datadoghq.com> | 2019-11-08 08:04:52 -0700 |
|---|---|---|
| committer | Levi Morrison <levi.morrison@datadoghq.com> | 2019-11-08 08:04:52 -0700 |
| commit | 1cb69c44d716cfea98a9566c80dd21a58732bbf8 (patch) | |
| tree | 92e25896c95c4c5f42604ed598d4da8082eddaf0 | |
| parent | 999e32b65a8a4bb59e27e538fa68ffae4b99d863 (diff) | |
| parent | 05bce66037c8994727dbeef888e0ceb57937aa97 (diff) | |
| download | php-git-1cb69c44d716cfea98a9566c80dd21a58732bbf8.tar.gz | |
Merge branch 'PHP-7.4'
| -rw-r--r-- | ext/standard/hrtime.h | 2 | ||||
| -rw-r--r-- | ext/standard/php_random.h | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/ext/standard/hrtime.h b/ext/standard/hrtime.h index 1ad9ff3f41..fa47e1c49f 100644 --- a/ext/standard/hrtime.h +++ b/ext/standard/hrtime.h @@ -18,8 +18,6 @@ #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 diff --git a/ext/standard/php_random.h b/ext/standard/php_random.h index 1cf471befe..c45a3249b9 100644 --- a/ext/standard/php_random.h +++ b/ext/standard/php_random.h @@ -17,6 +17,8 @@ #ifndef PHP_RANDOM_H #define PHP_RANDOM_H +BEGIN_EXTERN_C() + PHP_FUNCTION(random_bytes); PHP_FUNCTION(random_int); @@ -46,4 +48,6 @@ extern PHPAPI int random_globals_id; extern PHPAPI php_random_globals random_globals; #endif +END_EXTERN_C() + #endif |