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

Remove Windows sa_family_t typedef from public header #334

Merged
merged 1 commit into from
Jan 2, 2024
Merged

Remove Windows sa_family_t typedef from public header #334

merged 1 commit into from
Jan 2, 2024

Conversation

nwt
Copy link
Contributor

@nwt nwt commented Dec 29, 2023

This typedef isn't needed in maxminddb.h since sa_family_t isn't part of this library's public API. Moreover, it can conflict with typedefs in the headers of other libraries. Move the typedef from maxminddb.h to maxminddb.c, where sa_family_t is used.

This change makes it possible to build Zeek with libmaxminddb on Windows using MSVC, something that currently fails because it depends on libunistd and that also defines sa_family_t.

This typedef isn't needed in maxminddb.h since sa_family_t isn't part of
this library's public API.  Moreover, it can conflict with typedefs in
the headers of other libraries.  Move the typedef from maxminddb.h to
maxminddb.c, where sa_family_t is used.
Copy link
Member

@oschwald oschwald left a comment

Choose a reason for hiding this comment

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

Thank you!

@oschwald oschwald merged commit e7367c2 into maxmind:main Jan 2, 2024
15 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

2 participants