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

avoid sun as variable name in test/bio_addr_test.c #22281

Closed
wants to merge 1 commit into from

Conversation

vladak
Copy link
Contributor

@vladak vladak commented Oct 4, 2023

This change fixes a build failure on Solaris 11.4 (with either GCC or Oracle Developer Studio). On Solaris sun is an implicit define that collides with the variable name.

@mattcaswell mattcaswell added branch: master Merge to master branch approval: review pending This pull request needs review by a committer tests: exempted The PR is exempt from requirements for testing labels Oct 4, 2023
Copy link
Contributor

@tom-cosgrove-arm tom-cosgrove-arm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@tom-cosgrove-arm tom-cosgrove-arm added approval: done This pull request has the required number of approvals and removed approval: review pending This pull request needs review by a committer labels Oct 4, 2023
@t8m t8m added the triaged: bug The issue/pr is/fixes a bug label Oct 4, 2023
@slontis
Copy link
Member

slontis commented Oct 5, 2023

Can this be merged into the 3.2 release?

@paulidale
Copy link
Contributor

Yes, it should be in 3.2. No branch until beta which isn't yet.

@openssl-machine
Copy link
Collaborator

24 hours has passed since 'approval: done' was set, but as this PR has been updated in that time the label 'approval: ready to merge' is not being automatically set. Please review the updates and set the label manually.

@t8m
Copy link
Member

t8m commented Oct 5, 2023

Merged to the master branch. Thank you for your contribution.

@t8m t8m closed this Oct 5, 2023
openssl-machine pushed a commit that referenced this pull request Oct 5, 2023
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from #22281)
wanghao75 pushed a commit to openeuler-mirror/openssl that referenced this pull request Oct 9, 2023
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from openssl/openssl#22281)

Signed-off-by: fly2x <fly2x@hitls.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approval: done This pull request has the required number of approvals branch: master Merge to master branch tests: exempted The PR is exempt from requirements for testing triaged: bug The issue/pr is/fixes a bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants