Commit 412b4de

committed

Zend/zend_execute: re-add #include zend_dtrace.h

This was removed by commit ecc880f, but that broke builds with DTrace support; zend_execute.c does not actually need that header, but zend_vm_execute.h does. See php#10220 (comment) for the build failure report.

1 parent 889dba4 commit 412b4deCopy full SHA for 412b4de

File tree

1 file changed

-0

lines changed

Zend
- zend_execute.c

1 file changed

-0

lines changed

`‎Zend/zend_execute.c‎`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -5342,6 +5342,11 @@ ZEND_API void (ZEND_FASTCALL zend_touch_vm_stack_data)(void vm_stack_data) = N`
`5342`	`5342`	`#include "zend_fibers.h" // needed by zend_vm_execute.h`
`5343`	`5343`	`#include "zend_interfaces.h" // needed by zend_vm_execute.h`
`5344`	`5344`	`#include "zend_objects.h" // needed by zend_vm_execute.h`
	`5345`	`+`
	`5346`	`+#ifdef HAVE_DTRACE`
	`5347`	`+#include "zend_dtrace.h" // needed by zend_vm_execute.h for DTRACE_EXCEPTION_CAUGHT()`
	`5348`	`+#endif`
	`5349`	`+`
`5345`	`5350`	`#include "zend_vm_execute.h"`
`5346`	`5351`
`5347`	`5352`	`ZEND_API zend_result zend_set_user_opcode_handler(zend_uchar opcode, user_opcode_handler_t handler)`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 412b4de

File tree

1 file changed

1 file changed

`‎Zend/zend_execute.c‎`

0 commit comments