Merge branch 'PHP-7.3' into PHP-7.4

Author: morrisonlevi

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

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