diff options
| author | Levi Morrison <levi.morrison@datadoghq.com> | 2019-11-08 08:02:49 -0700 |
|---|---|---|
| committer | Levi Morrison <levi.morrison@datadoghq.com> | 2019-11-08 08:02:49 -0700 |
| commit | 05bce66037c8994727dbeef888e0ceb57937aa97 (patch) | |
| tree | 14a8fd736d9444eb422ccdcd939d931106744824 | |
| parent | 6ddb381ae5b6f6063d5d8295c3ed8da9a0383562 (diff) | |
| parent | 4a55794b980c3d4b85788f5adb7d1fe5ec1a58e3 (diff) | |
| download | php-git-05bce66037c8994727dbeef888e0ceb57937aa97.tar.gz | |
Merge branch 'PHP-7.3' into 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 6f6b30e41a..edd68aaceb 100644 --- a/ext/standard/hrtime.h +++ b/ext/standard/hrtime.h @@ -20,8 +20,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 3398ddb534..e61a80fa9e 100644 --- a/ext/standard/php_random.h +++ b/ext/standard/php_random.h @@ -19,6 +19,8 @@ #ifndef PHP_RANDOM_H #define PHP_RANDOM_H +BEGIN_EXTERN_C() + PHP_FUNCTION(random_bytes); PHP_FUNCTION(random_int); @@ -48,4 +50,6 @@ extern PHPAPI int random_globals_id; extern PHPAPI php_random_globals random_globals; #endif +END_EXTERN_C() + #endif |