Check if it has been defined before defining _GNU_SOURCE #7958
Conversation
This file contains 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
|
Can one of the admins verify this patch? |
|
Okay to test. Contributor agreement in progress. |
|
Retest this please: |
dgarske
approved these changes
Sep 9, 2024
douzzer
requested changes
Sep 10, 2024
There was a problem hiding this comment.
I assume the problem this addresses is when a system header defines _GNU_SOURCE to 1, then this is undone by the code in bio.c and ssl.c. Seems like a good fix.
I'd like to see the #undef _GNU_SOURCE clauses removed from inside the conditions, now that the outer gates have made them frivolous.
| @@ -24,7 +24,7 @@ | |||
| #endif | |||
|
|
|||
| #include <wolfssl/wolfcrypt/settings.h> | |||
| #if defined(OPENSSL_EXTRA) && !defined(_WIN32) | |||
| #if defined(OPENSSL_EXTRA) && !defined(_WIN32) && !defined(_GNU_SOURCE) | |||
| /* turn on GNU extensions for XVASPRINTF with wolfSSL_BIO_printf */ | |||
| #undef _GNU_SOURCE | |||
There was a problem hiding this comment.
remove this now that it's frivolous
| @@ -25,7 +25,7 @@ | |||
| #endif | |||
|
|
|||
| #include <wolfssl/wolfcrypt/settings.h> | |||
| #if defined(OPENSSL_EXTRA) && !defined(_WIN32) | |||
| #if defined(OPENSSL_EXTRA) && !defined(_WIN32) && !defined(_GNU_SOURCE) | |||
| /* turn on GNU extensions for XISASCII */ | |||
| #undef _GNU_SOURCE | |||
|
superseded by #7971 |
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.
Description
Do a check for the
_GNU_SOURCEmacro before defining it.Fixes #7957
Testing
Tested by building WolfSSL 5.7.2 against Netatalk.
Checklist
N/A