Skip to content

Fix: Amalgamated Windows Builds with PKCS 11#5486

Merged
randombit merged 1 commit into
randombit:masterfrom
Rohde-Schwarz:fix/p11-win-amalg
Mar 25, 2026
Merged

Fix: Amalgamated Windows Builds with PKCS 11#5486
randombit merged 1 commit into
randombit:masterfrom
Rohde-Schwarz:fix/p11-win-amalg

Conversation

@FAlbertDev
Copy link
Copy Markdown
Collaborator

@FAlbertDev FAlbertDev commented Mar 25, 2026

Fix for #5482

The windows header defines a macro interface for structs:
windows.h includes ole2.h includes objbase.h includes combaseapi.h which defines:

#define __STRUCT__ struct
#define interface __STRUCT__

Unfortunately, I named some parameters "interface", which causes trouble in amalgamation builds. I have no idea how this wasn't catched by our CI.

The windows header defines a macro "interface" for structs. Paramerters must not be named like this.
@FAlbertDev FAlbertDev requested a review from randombit March 25, 2026 17:49
@coveralls
Copy link
Copy Markdown

Coverage Status

coverage: 89.48% (+0.001%) from 89.479%
when pulling af7b19a on Rohde-Schwarz:fix/p11-win-amalg
into 60de912 on randombit:master.

Copy link
Copy Markdown
Owner

@randombit randombit left a comment

Choose a reason for hiding this comment

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

Thanks for investigating this

@randombit randombit merged commit 35787f5 into randombit:master Mar 25, 2026
44 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants