Merge pull request #115 from Jan-E/master

Add config.w32 for building on Windows
maxmind · Jan 4, 2021 · fbc1257 · fbc1257
2 parents ea95574 + 4bffde0
commit fbc1257
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/ext/config.w32 b/ext/config.w32
@@ -0,0 +1,10 @@
+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("libmaxminddb.lib", "maxminddb", PHP_MAXMINDDB)) {
+		EXTENSION("maxminddb", "maxminddb.c");
+	} else {
+		WARNING('Could not find maxminddb.h or libmaxminddb.lib; skipping');
+	}
+}
diff --git a/ext/maxminddb.c b/ext/maxminddb.c
@@ -431,7 +431,7 @@ handle_map(const MMDB_entry_data_list_s *entry_data_list,
     array_init(z_value);
     const uint32_t map_size = entry_data_list->entry_data.data_size;
 
-    uint i;
+    uint32_t i;
     for (i = 0; i < map_size && entry_data_list; i++) {
         entry_data_list = entry_data_list->next;
 
@@ -463,7 +463,7 @@ handle_array(const MMDB_entry_data_list_s *entry_data_list,
 
     array_init(z_value);
 
-    uint i;
+    uint32_t i;
     for (i = 0; i < size && entry_data_list; i++) {
         entry_data_list = entry_data_list->next;
         zval new_value;

diff --git a/package.xml b/package.xml
@@ -33,6 +33,7 @@
 
             <dir name="ext">
                 <file role="src" name="config.m4"/>
+                <file role="src" name="config.w32"/>
 
                 <file role="src" name="maxminddb.c"/>
                 <file role="src" name="php_maxminddb.h"/>