Skip to content

Commit b75775e

Browse files
committed
Revert "Merge branch 'PHP-8.3'"
This reverts commit b363a60, reversing changes made to 3ed5eee.
1 parent 9684007 commit b75775e

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

Zend/zend_max_execution_timer.c

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,14 @@
2727
# include <pthread_np.h>
2828
# endif
2929

30+
#include "zend.h"
31+
#include "zend_globals.h"
32+
#include "zend_portability.h"
33+
3034
#if __has_feature(memory_sanitizer)
3135
# include <sanitizer/msan_interface.h>
3236
#endif
3337

34-
#include "zend.h"
35-
#include "zend_globals.h"
36-
3738
// Musl Libc defines this macro, glibc does not
3839
// According to "man 2 timer_create" this field should always be available, but it's not: https://sourceware.org/bugzilla/show_bug.cgi?id=27417
3940
# ifndef sigev_notify_thread_id
@@ -67,8 +68,8 @@ ZEND_API void zend_max_execution_timer_init(void) /* {{{ */
6768

6869
#if __has_feature(memory_sanitizer)
6970
/* MSan does not intercept timer_create() */
70-
__msan_unpoison(&EG(max_execution_timer_timer),
71-
sizeof(EG(max_execution_timer_timer)));
71+
__msan_unpoison(&EG(max_execution_timer_timer),
72+
sizeof(EG(max_execution_timer_timer)));
7273
#endif
7374

7475
// Measure wall time instead of CPU time as originally planned now that it is possible https://github.com/php/php-src/pull/6504#issuecomment-1370303727

0 commit comments

Comments
 (0)