Skip to content

Rename bswap32/bswap64 to mmdb_bswap32/mmdb_bswap64#420

Merged
horgh merged 2 commits intomainfrom
greg/fix-bswap-macos-collision
Feb 25, 2026
Merged

Rename bswap32/bswap64 to mmdb_bswap32/mmdb_bswap64#420
horgh merged 2 commits intomainfrom
greg/fix-bswap-macos-collision

Conversation

@oschwald
Copy link
Member

On macOS 26, sys/endian.h defines bswap32 and bswap64 as macros.
Since maxminddb.h includes sys/endian.h when available, our static
inline function declarations collide with those macros, causing a
compilation failure.

Rename to mmdb_bswap32/mmdb_bswap64 to avoid the namespace collision
entirely. These are internal static functions so the rename is safe.

Fixes #419

Co-Authored-By: Claude Opus 4.6 noreply@anthropic.com

On macOS 26, sys/endian.h defines bswap32 and bswap64 as macros.
Since maxminddb.h includes sys/endian.h when available, our static
inline function declarations collide with those macros, causing a
compilation failure.

Rename to mmdb_bswap32/mmdb_bswap64 to avoid the namespace collision
entirely. These are internal static functions so the rename is safe.

Fixes #419

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@gemini-code-assist
Copy link

Summary of Changes

Hello @oschwald, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request addresses a critical compilation issue encountered on macOS 26 by proactively preventing name collisions between internal byte-swapping utility functions and system-defined macros. The change ensures broader compatibility and stability of the codebase without altering the core logic or external API.

Highlights

  • Compilation Fix for macOS 26: Resolved a compilation failure on macOS 26 (Tahoe) where sys/endian.h defines bswap32 and bswap64 as macros, leading to a namespace collision with internal function declarations.
  • Function Renaming: Renamed the internal static functions bswap32 and bswap64 to mmdb_bswap32 and mmdb_bswap64 respectively, to prevent conflicts with system headers.
  • Changelog Update: Added a new entry to Changes.md for version 1.13.2, documenting the fix for the macOS compilation issue.
Changelog
Activity
Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

Copy link

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

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

Code Review

This pull request addresses a compilation failure on macOS by renaming the internal bswap32 and bswap64 functions to mmdb_bswap32 and mmdb_bswap64 respectively. This prevents a name collision with macros defined in sys/endian.h. The changes are applied consistently across the function definitions and their call sites within src/maxminddb.c. The Changes.md file is also updated to document this fix. The changes are correct and effectively resolve the issue.

horgh
horgh previously approved these changes Feb 25, 2026
@horgh horgh merged commit dd4e3d8 into main Feb 25, 2026
47 checks passed
@horgh horgh deleted the greg/fix-bswap-macos-collision branch February 25, 2026 17:47
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