Fix bug #71575 removing extra semicolons outside macros #1768
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
Member
|
There's a few more occurrences of this particular semicolon, would be nice to fix all of them at once: http://lxr.php.net/search?q=ZEND_EXTERN_MODULE_GLOBALS&defs=&refs=&path=&hist=&project=PHP_MASTER |
Zend/zend.h
Outdated
| #endif | ||
|
|
||
| ZEND_TSRMLS_CACHE_EXTERN(); | ||
| ZEND_TSRMLS_CACHE_EXTERN() |
Member
There was a problem hiding this comment.
This macro requires a semicolon under ZTS. If we want to change this, the semicolon needs to be added to the ZTS macro definition.
Contributor
Author
There was a problem hiding this comment.
Okay; not sure I'd feel comfortable changing that just yet, so I've reverted this one.
0b02476 to
24ed48e
Compare
Contributor
Author
|
@nikic thanks; I grepped and updated all the occurrences I could find. |
Member
|
actually, these ; are no harm, and is good for auto-indent tools. why it bother you? |
Member
|
oh, sorry, I didn't read the bug report. I get it now. thanks |
Member
Contributor
Author
|
Thanks @nikic |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
See https://bugs.php.net/bug.php?id=71575
This removes extra semicolons outside macro calls when including
php.h.