Skip to content

#include cleanup part 3 #10279

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 22 commits into from
Jan 12, 2023
Merged

#include cleanup part 3 #10279

merged 22 commits into from
Jan 12, 2023

Conversation

MaxKellermann
Copy link
Contributor

See #10216 and #10220
All commits ordered in a way that each of them builds properly, to avoid breaking bisects.
@Girgias?

Girgias
Girgias reviewed Jan 10, 2023
View reviewed changes
@MaxKellermann
Copy link
Contributor Author

CI failures look similar:

Cannot load Zend OPcache - it was built with configuration API420220830,NTS,debug, whereas running engine is API420220830,NTS

I guess some sources need to include php_config.h to generate the correct API name, and that include is missing somewhere, and was accidently implied before I fixed the includes?

@MaxKellermann
Zend/zend_build.h: include php_config.h
7fad42c 
Without this, the macros ZTS, ZEND_DEBUG and PHP_COMPILER_ID may be
unavailable.
@MaxKellermann
Copy link
Contributor Author

I guess some sources need to include php_config.h to generate the correct API name

That's it, that include was missing in zend_build.h - let's see if it works now.

@MaxKellermann
main/php_globals.h: add missing include for PHPAPI
16947f7
@MaxKellermann
ext/standard/md5: include cleanup
11da3c7
@MaxKellermann
Zend/zend_system_id: include cleanup
ac2e01b
@MaxKellermann
Zend/zend_arena: include cleanup
fa36831
@MaxKellermann
Zend/zend_multiply: include cleanup
a0ac083
@MaxKellermann
Zend/zend_extensions: include cleanup
c6caa27
@MaxKellermann
Zend/zend_float: include cleanup
fec929b
@MaxKellermann
Zend/zend_stream: include cleanup
beb188f
@MaxKellermann
Zend/Optimizer/zend_cfg: include cleanup
eb66a59
@MaxKellermann
Zend/Optimizer/zend_optimizer: include cleanup
a976ed9
@MaxKellermann
Zend/Optimizer/zend_ssa: include cleanup
f28311e
@MaxKellermann
Zend/zend_long: include cleanup
fb28534
@MaxKellermann
ext/opcache/zend_accelerator_hash: include cleanup
4d3cb44
@MaxKellermann
Zend/zend_bitset: include cleanup
de8db1b
@MaxKellermann
Zend/Optimizer/scdf: include cleanup
18b168b
@MaxKellermann
Zend/Optimizer/dce: include cleanup
299c244
@MaxKellermann
Zend/Optimizer/sccp: include cleanup
0b89bed
@MaxKellermann
Zend/Optimizer/zend_call_graph: include cleanup
ebbda1f
@MaxKellermann
Zend/zend_inference: include cleanup
16ed908
@MaxKellermann
Zend/zend_map_ptr: include cleanup
feefca4
@MaxKellermann
Copy link
Contributor Author

Yay, all green. @Girgias?

@Girgias Girgias merged commit 45a128c into php:master Jan 12, 2023
@MaxKellermann MaxKellermann deleted the include_cleanup3 branch January 12, 2023 15:24
cmb69 added a commit that referenced this pull request Jan 16, 2023
@cmb69
Revert GH-10279
2f4973f 
Cf. <#10220 (comment)>.

This reverts commit 45a128c.
This reverts commit 1eb71c3.
This reverts commit 492523a.
This reverts commit c7a4633.
This reverts commit 308adb9.
This reverts commit cd27d5e.
This reverts commit c593340.
This reverts commit 46371f4.
This reverts commit 623e2e9.
This reverts commit e7434c1.
This reverts commit d28d323.
This reverts commit 1a067b8.
This reverts commit a55c0c5.
This reverts commit b5aeb3a.
This reverts commit f061a03.
This reverts commit b088575.
This reverts commit b1d4877.
This reverts commit 94f9a20.
This reverts commit 4831e48.
This reverts commit cd985de.
This reverts commit 9521d21.
This reverts commit d613615.
@MaxKellermann MaxKellermann mentioned this pull request Jan 16, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Girgias Girgias Girgias approved these changes

Assignees
No one assigned
Labels
Category: Engine Category: Optimizer Extension: opcache Extension: standard
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@MaxKellermann @Girgias