[php-src] master: Merge branch 'PHP-8.3' of https://github.com/php/php-src
| From: | Bob Weinand | Date: | Sun, 17 Mar 2024 02:31:15 +0000 |
| Subject: | [php-src] master: Merge branch 'PHP-8.3' of https://github.com/php/php-src | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-127756@lists.php.net to get a copy of this message | ||
Author: Bob Weinand (bwoebi)
Date: 2024-03-17T03:17:15+01:00
Commit: https://github.com/php/php-src/commit/6f49474542a7b169a54fed7232fc1760d41d5cac
Raw diff: https://github.com/php/php-src/commit/6f49474542a7b169a54fed7232fc1760d41d5cac.diff
Merge branch 'PHP-8.3' of https://github.com/php/php-src
Changed paths:
M Zend/zend_hrtime.c
M Zend/zend_hrtime.h
Diff:
diff --git a/Zend/zend_hrtime.c b/Zend/zend_hrtime.c
index a28ba3f47050..bcf11964f1ce 100644
--- a/Zend/zend_hrtime.c
+++ b/Zend/zend_hrtime.c
@@ -31,13 +31,13 @@
# define WIN32_LEAN_AND_MEAN
-double zend_hrtime_timer_scale = .0;
+ZEND_API double zend_hrtime_timer_scale = .0;
#elif ZEND_HRTIME_PLATFORM_APPLE
# include <mach/mach_time.h>
# include <string.h>
-mach_timebase_info_data_t zend_hrtime_timerlib_info = {
+ZEND_API mach_timebase_info_data_t zend_hrtime_timerlib_info = {
.numer = 0,
.denom = 1,
};
diff --git a/Zend/zend_hrtime.h b/Zend/zend_hrtime.h
index 6bba076738a9..1449c4e443cf 100644
--- a/Zend/zend_hrtime.h
+++ b/Zend/zend_hrtime.h
@@ -60,13 +60,13 @@ BEGIN_EXTERN_C()
#if ZEND_HRTIME_PLATFORM_WINDOWS
-extern double zend_hrtime_timer_scale;
+ZEND_API extern double zend_hrtime_timer_scale;
#elif ZEND_HRTIME_PLATFORM_APPLE
# include <mach/mach_time.h>
# include <string.h>
-extern mach_timebase_info_data_t zend_hrtime_timerlib_info;
+ZEND_API extern mach_timebase_info_data_t zend_hrtime_timerlib_info;
#endif