Skip to content

Commit 89daa83

Browse files
zeriyoshicmb69
authored andcommitted
zend_max_execution_timer: fix gcc compatibility (#15447)
1 parent 3162ddb commit 89daa83

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

Zend/zend_max_execution_timer.c

+6-5
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,14 @@
2424
#include <sys/syscall.h>
2525
#include <sys/types.h>
2626

27+
#include "zend.h"
28+
#include "zend_globals.h"
29+
#include "zend_portability.h"
30+
2731
#if __has_feature(memory_sanitizer)
2832
# include <sanitizer/msan_interface.h>
2933
#endif
3034

31-
#include "zend.h"
32-
#include "zend_globals.h"
33-
3435
// Musl Libc defines this macro, glibc does not
3536
// 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
3637
# ifndef sigev_notify_thread_id
@@ -53,8 +54,8 @@ ZEND_API void zend_max_execution_timer_init(void) /* {{{ */
5354

5455
#if __has_feature(memory_sanitizer)
5556
/* MSan does not intercept timer_create() */
56-
__msan_unpoison(&EG(max_execution_timer_timer),
57-
sizeof(EG(max_execution_timer_timer)));
57+
__msan_unpoison(&EG(max_execution_timer_timer),
58+
sizeof(EG(max_execution_timer_timer)));
5859
#endif
5960

6061
// 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)