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
threads_win: fix build error with VS2010 #24370
Closed
Closed
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
VC 2010 or earlier compilers do not support static inline. To work around this problem, we can use the ossl_inline macro. Fixes: crypto\threads_win.c(171) : error C2054: expected '(' to follow 'inline' crypto\threads_win.c(172) : error C2085: 'get_hold_current_qp' : not in formal parameter list crypto\threads_win.c(172) : error C2143: syntax error : missing ';' before '{' crypto\threads_win.c(228) : warning C4013: 'get_hold_current_qp' undefined; assuming extern returning int crypto\threads_win.c(228) : warning C4047: '=' : 'rcu_qp *' differs in levels of indirection from 'int' Signed-off-by: Georgi Valkov <gvalkov@gmail.com>
github-actions
bot
added
the
severity: fips change
The pull request changes FIPS provider sources
label
May 11, 2024
2 tasks
tom-cosgrove-arm
added
branch: master
Merge to master branch
approval: review pending
This pull request needs review by a committer
approval: otc review pending
This pull request needs review by an OTC member
triaged: bug
The issue/pr is/fixes a bug
labels
May 11, 2024
tom-cosgrove-arm
approved these changes
May 11, 2024
There was a problem hiding this 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
removed
the
approval: review pending
This pull request needs review by a committer
label
May 11, 2024
shahsb
approved these changes
May 12, 2024
t8m
added
branch: 3.3
Merge to openssl-3.3
tests: exempted
The PR is exempt from requirements for testing
labels
May 13, 2024
t8m
approved these changes
May 13, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Applies also to the 3.3 branch.
t8m
added
approval: done
This pull request has the required number of approvals
and removed
approval: otc review pending
This pull request needs review by an OTC member
labels
May 13, 2024
openssl-machine
removed
the
approval: done
This pull request has the required number of approvals
label
May 14, 2024
This pull request is ready to merge |
openssl-machine
added
the
approval: ready to merge
The 24 hour grace period has passed, ready to merge
label
May 14, 2024
Merged to the master and 3.3 branches. Thank you for your contribution. |
openssl-machine
pushed a commit
that referenced
this pull request
May 14, 2024
VC 2010 or earlier compilers do not support static inline. To work around this problem, we can use the ossl_inline macro. Fixes: crypto\threads_win.c(171) : error C2054: expected '(' to follow 'inline' crypto\threads_win.c(172) : error C2085: 'get_hold_current_qp' : not in formal parameter list crypto\threads_win.c(172) : error C2143: syntax error : missing ';' before '{' crypto\threads_win.c(228) : warning C4013: 'get_hold_current_qp' undefined; assuming extern returning int crypto\threads_win.c(228) : warning C4047: '=' : 'rcu_qp *' differs in levels of indirection from 'int' Signed-off-by: Georgi Valkov <gvalkov@gmail.com> Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from #24370)
openssl-machine
pushed a commit
that referenced
this pull request
May 14, 2024
VC 2010 or earlier compilers do not support static inline. To work around this problem, we can use the ossl_inline macro. Fixes: crypto\threads_win.c(171) : error C2054: expected '(' to follow 'inline' crypto\threads_win.c(172) : error C2085: 'get_hold_current_qp' : not in formal parameter list crypto\threads_win.c(172) : error C2143: syntax error : missing ';' before '{' crypto\threads_win.c(228) : warning C4013: 'get_hold_current_qp' undefined; assuming extern returning int crypto\threads_win.c(228) : warning C4047: '=' : 'rcu_qp *' differs in levels of indirection from 'int' Signed-off-by: Georgi Valkov <gvalkov@gmail.com> Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from #24370) (cherry picked from commit d8dd1df)
2 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
approval: ready to merge
The 24 hour grace period has passed, ready to merge
branch: master
Merge to master branch
branch: 3.3
Merge to openssl-3.3
severity: fips change
The pull request changes FIPS provider sources
tests: exempted
The PR is exempt from requirements for testing
triaged: bug
The issue/pr is/fixes a bug
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.
VC 2010 or earlier compilers do not support
static inline
. To work around this problem, we can use theossl_inline
macro.Fixes:
This PR is part 2/3 of #24326 which has been split.
Build and run tested:
@t8m @nhorman @tom-cosgrove-arm @viruscamp @levitte @paulidale @mattcaswell @hlandau
Checklist