Skip to content

STF-1287: Accept either libmaxminddb.lib or maxminddb.lib on Windows #263

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

Merged
horgh merged 1 commit into from
Jul 31, 2026
+7 −6
Merged

STF-1287: Accept either libmaxminddb.lib or maxminddb.lib on Windows #263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@ CHANGELOG
1.14.0
-------------------

* Updated the Windows build configuration to use the correct libmaxminddb
name (`maxminddb.lib` instead of `libmaxminddb.lib`) when building the
extension. The `lib` prefix was removed in libmaxminddb 1.6.0. Pull
request by Jean-Baptiste Nahan. GitHub #231.
* The Windows build configuration now accepts either `libmaxminddb.lib` or
`maxminddb.lib` when building the extension. The `lib` prefix was removed
in libmaxminddb 1.6.0, but the libmaxminddb that PHP publishes for Windows
builds is still 1.5.0, which uses the prefixed name. Pull request by
Jean-Baptiste Nahan. GitHub #231.
* Replaced `XtOffsetOf()` with `offsetof()`. The `XtOffsetOf()` alias has
been removed in PHP 8.6. Pull request by Remi Collet. GitHub #252.

Expand Down
4 changes: 2 additions & 2 deletions ext/config.w32
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ ARG_WITH("maxminddb", "Enable MaxMind DB Reader extension support", "no");

if (PHP_MAXMINDDB == "yes") {
if (CHECK_HEADER_ADD_INCLUDE("maxminddb.h", "CFLAGS_MAXMINDDB", PHP_MAXMINDDB + ";" + PHP_PHP_BUILD + "\\include\\maxminddb") &&
CHECK_LIB("maxminddb.lib", "maxminddb", PHP_MAXMINDDB)) {
CHECK_LIB("libmaxminddb.lib;maxminddb.lib", "maxminddb", PHP_MAXMINDDB)) {
EXTENSION("maxminddb", "maxminddb.c");
} else {
WARNING('Could not find maxminddb.h or maxminddb.lib; skipping');
WARNING('Could not find maxminddb.h, libmaxminddb.lib, or maxminddb.lib; skipping');
}
}
Loading