Generated arginfo headers: combine preprocessor conditional blocks (2) #18667
+13
−817
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
DanielEScherzer
requested review from
bukka,
nielsdos,
devnexen,
kamil-tekiela,
SakiTakamachi,
NattyNarwhal,
Girgias,
adoy and
kocsismate
as code owners
github-actions
bot
added
Category: Build System
Extension: openssl
Extension: intl
Extension: com_dotnet
Extension: curl
Extension: dba
Extension: gd
Extension: ldap
Extension: odbc
Extension: pcntl
Extension: pdo_mysql
Extension: sockets
Extension: sodium
Extension: standard
Extension: tidy
Extension: xsl
Extension: zip
ABI break
labels
jorgsowa
reviewed
May 26, 2025
| REGISTER_LONG_CONSTANT("DNS_PTR", PHP_DNS_PTR, CONST_PERSISTENT); | ||
| #endif | ||
| #if (defined(PHP_WIN32) || (defined(HAVE_DNS_SEARCH_FUNC) && defined(HAVE_FULL_DNS_FUNCS))) | ||
| REGISTER_LONG_CONSTANT("DNS_HINFO", PHP_DNS_HINFO, CONST_PERSISTENT); | ||
| #endif | ||
| #if (defined(PHP_WIN32) || (defined(HAVE_DNS_SEARCH_FUNC) && defined(HAVE_FULL_DNS_FUNCS))) && (!defined(PHP_WIN32)) | ||
| REGISTER_LONG_CONSTANT("DNS_CAA", PHP_DNS_CAA, CONST_PERSISTENT); | ||
| #endif | ||
| #if (defined(PHP_WIN32) || (defined(HAVE_DNS_SEARCH_FUNC) && defined(HAVE_FULL_DNS_FUNCS))) |
There was a problem hiding this comment.
Potential improvement: you have the same condition on lines 3593 and 3614.
DanielEScherzer
force-pushed
the
arginfo-combine-conds-2
branch
from
ea3af1b to
ff133a2
Compare
|
If there are no objections in the next few days I plan to merge this (cc @kocsismate if you wanted to take a look) |
kocsismate
reviewed
Jun 22, 2025
kocsismate
reviewed
Jun 22, 2025
When global constants' or class constants' availability is based on some preprocessor condition, the generated arginfo header files wrap the declarations in the preprocessor `#if` conditional blocks, one per declaration, even if they are in the same conditional block based on comments in the stub file. Instead of having multiple conditional blocks one after the other with the same condition, combine them into a single conditional block.
DanielEScherzer
force-pushed
the
arginfo-combine-conds-2
branch
from
14b7352 to
b8cb368
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When global constants' or class constants' availability is based on some preprocessor condition, the generated arginfo header files wrap the declarations in the preprocessor
#ifconditional blocks, one per declaration, even if they are in the same conditional block based on comments in the stub file. Instead of having multiple conditional blocks one after the other with the same condition, combine them into a single conditional block.