Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from

Conversation

MaxKellermann
Copy link
Contributor

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 #10220 (comment) for the build failure report.

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.
@MaxKellermann
Copy link
Contributor Author

@shivammathur

@MaxKellermann
Copy link
Contributor Author

@shivammathur has confirmed that this fixes the regression: #10220 (comment)

What remains open is @dstogov's complaint that I added the include right before #include "zend_vm_execute.h" and not at the top of the file, but I believe that's the right location for a reason. Of course I'll change that if it looks like the majority believes it belongs to the top (does the #include "zend_vm_execute.h" also belong to the top, then? - what about those #includes in main/php.h?).

@MaxKellermann
Copy link
Contributor Author

Obsolete now that all include cleanups have been reverted. My new PR #10345 contains this fix already.

@MaxKellermann MaxKellermann deleted the include_dtrace branch January 17, 2023 10:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant