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.

Sign up for GitHub

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

Jump to bottom

p11-kit: Move CRYPTOKI_GNU definitions to <p11-kit/p11-kit.h> #653

Merged
merged 1 commit into from
Aug 2, 2024
Merged

p11-kit: Move CRYPTOKI_GNU definitions to <p11-kit/p11-kit.h> #653

merged 1 commit into from
Aug 2, 2024

Conversation

ueno
Copy link
Member

@ueno ueno commented Aug 2, 2024

Previously, the same fallback types are defined in <p11-kit/uri.h> and <p11-kit/iter.h> if CRYPTOKI_GNU is defined. This moves those to <p11-kit/p11-kit.h> so they are not redefined.

Fixes: #649

@ueno
p11-kit: Move CRYPTOKI_GNU definitions to <p11-kit/p11-kit.h>
692a09a 
Previously, the same fallback types are defined in <p11-kit/uri.h> and
<p11-kit/iter.h> if CRYPTOKI_GNU is defined. This moves those to
<p11-kit/p11-kit.h> so they are not redefined.

Signed-off-by: Daiki Ueno <[email protected]>
@ueno ueno mentioned this pull request Aug 2, 2024
Closed
@coveralls
Copy link

Coverage Status

coverage: 69.533%. remained the same
when pulling 692a09a on ueno:wip/dueno/compat-simple
into 078acdd on p11-glue:master.

ZoltanFridrich
ZoltanFridrich approved these changes Aug 2, 2024
View reviewed changes
Copy link
Contributor

@ZoltanFridrich ZoltanFridrich left a comment

Choose a reason for hiding this comment

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

I can't verify whether it works, but it looks good.

@ueno
Copy link
Member Author

ueno commented Aug 2, 2024

I can't verify whether it works, but it looks good.

Me neither, but with CFLAGS="-std=gnu99 -pedantic", the warning is gone.

@ueno ueno merged commit 5332245 into p11-glue:master Aug 2, 2024
13 of 14 checks passed
@ueno
Copy link
Member Author

ueno commented Aug 2, 2024

Thanks for the review!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ZoltanFridrich ZoltanFridrich ZoltanFridrich approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

On PPC Tiger, old Mac OS X 10.4.11, test target does not build with GCC 4.2
3 participants
@ueno @coveralls @ZoltanFridrich