summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLevi Morrison <levim@php.net>2019-11-07 14:51:21 -0700
committerLevi Morrison <levi.morrison@datadoghq.com>2019-11-08 07:58:26 -0700
commit4a55794b980c3d4b85788f5adb7d1fe5ec1a58e3 (patch)
treeb885b4d87cae9756677d92b67e13a9a60261bf23
parentb9dfa12853c0f43ce76221d54cfd0568f674bac1 (diff)
downloadphp-git-4a55794b980c3d4b85788f5adb7d1fe5ec1a58e3.tar.gz
Wrap php_random.h in C++ portability macros
Also remove portability headers. This goes against the existing conventions of these files.
-rw-r--r--ext/standard/hrtime.h2
-rw-r--r--ext/standard/php_random.h4
2 files changed, 4 insertions, 2 deletions
diff --git a/ext/standard/hrtime.h b/ext/standard/hrtime.h
index 1c08b07502..b1d43ce55c 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 9bc53db09e..dc92c86c67 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,6 +50,8 @@ extern PHPAPI int random_globals_id;
extern PHPAPI php_random_globals random_globals;
#endif
+END_EXTERN_C()
+
#endif
/*