Skip to content
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

Fix check on SSL, MBEDTLS, WINSSL exclusivity #818

Closed
wants to merge 2 commits into from

Conversation

@Jan-E
Copy link
Contributor

commented May 19, 2016

@mention-bot

This comment has been minimized.

Copy link

commented May 19, 2016

By analyzing the blame information on this pull request, we identified @BurningEnlightenment and @vszakats to be potential reviewers

@@ -118,6 +114,10 @@ USE_MBEDTLS = true
MBEDTLS = $(WITH_MBEDTLS)
!ENDIF

!IF ( "$(USE_SSL)"=="true" && "$(USE_WINSSL)"=="true" ) || ( "$(USE_SSL)"=="true" && "$(USE_MBEDTLS)"=="true" ) || ( "$(USE_MBEDTLS)"=="true" && "$(USE_WINSSL)"=="true" )

This comment has been minimized.

Copy link
@BurningEnlightenment

BurningEnlightenment May 20, 2016

Contributor

That's a pretty long line, I suggest you wrap it like so:

!IF "$(USE_SSL)"=="true" && "$(USE_WINSSL)"=="true" \
 || "$(USE_SSL)"=="true" && "$(USE_MBEDTLS)"=="true" \
 || "$(USE_MBEDTLS)"=="true" && "$(USE_WINSSL)"=="true"

Otherwise well done! :shipit:

This comment has been minimized.

Copy link
@Jan-E

Jan-E May 20, 2016

Author Contributor

AFAIK, line wrapping like that does not work in Visual C makefiles

This comment has been minimized.

Copy link
@Jan-E

Jan-E May 20, 2016

Author Contributor

BTW: the parentheses around the && pairs are once again gone in your suggestion. They really should be there.

This comment has been minimized.

Copy link
@BurningEnlightenment

BurningEnlightenment May 20, 2016

Contributor

I haven't checked the docs whether it is supposed to work with preprocessor directives, but it is supported for commands as documented here and I used it in practice without encountering any issues.

BTW: the parentheses around the && pairs are once again gone in your suggestion. They really should be there.

No they are unnecessary, because of a feature called operator precedence which is documented here.

This comment has been minimized.

Copy link
@Jan-E

Jan-E May 20, 2016

Author Contributor

The parentheses may be unnecessary, but for readability I would still leave them there.

The backslash followed by a line-end was indeed documented for commands I see now, even for VC9. But line-ends and Windows are messy stuff, so why not choose the safe solution? Better safe than sorry.

This comment has been minimized.

Copy link
@Jan-E

Jan-E May 20, 2016

Author Contributor

Fine with me. Priority is that the building works.

This comment has been minimized.

Copy link
@bagder

bagder May 20, 2016

Member

I (although I like to say we so that it doesn't sound so much like a dictatorship), like code that isn't terribly wide as it makes it easier to read so I'm for breaking the line up into several with backslash-continuations.

This comment has been minimized.

Copy link
@Jan-E

Jan-E May 20, 2016

Author Contributor

With or without the parentheses? If you break it up the logic is clearer, but nevertheless...

This comment has been minimized.

Copy link
@bagder

bagder May 20, 2016

Member

I don't have a strong opinion on that but would leave that to you who're writing this, but my general preference is to add parentheses to help readers to not have to dig out any forgotten precedence rules to understand the order.

This comment has been minimized.

Copy link
@Jan-E

Jan-E May 20, 2016

Author Contributor

Added this to the PR. Please merge.

@bagder bagder closed this in 6bdc609 May 20, 2016

@bagder

This comment has been minimized.

Copy link
Member

commented May 20, 2016

thanks!

@Jan-E

This comment has been minimized.

Copy link
Contributor Author

commented May 20, 2016

BTW: building on VC9, VC11, VC14 * x86, x64 confirm that the patch is OK.

@lock lock bot locked as resolved and limited conversation to collaborators Jan 19, 2019

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
4 participants
You can’t perform that action at this time.