- Fix new -m on Windows

diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index 984ac63c19b8473fa5d9ad0170c529244e6df5c8..761e1b142e7e6a7905446a004fb097c7bb9659ba 100644 (file)
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -30,7 +30,7 @@
 
 /* these variables are true statics/globals, and have to be mutex'ed on every access */
 static int module_count=0;
-HashTable module_registry;
+ZEND_API HashTable module_registry;
 
 /* this function doesn't check for too many parameters */
 ZEND_API int zend_get_parameters(int ht, int param_count, ...)

diff --git a/Zend/zend_modules.h b/Zend/zend_modules.h
index a2906b42ab2c6d8ff06178408b5b1a7ff0a325f2..0dd01306c8d8d267ae8095f07987750556ac93a9 100644 (file)
--- a/Zend/zend_modules.h
+++ b/Zend/zend_modules.h
@@ -75,7 +75,7 @@ struct _zend_module_entry {
 };
 
 
-extern HashTable module_registry;
+extern ZEND_API HashTable module_registry;
 
 void module_destructor(zend_module_entry *module);
 int module_registry_cleanup(zend_module_entry *module);

diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
index 5002803aee50e5a2e05637be7a0adb3d1ad9403f..7038f2dead710115b96d12b6657444c91c2feed0 100644 (file)
--- a/sapi/cgi/cgi_main.c
+++ b/sapi/cgi/cgi_main.c
@@ -22,6 +22,7 @@
 #include "php.h"
 #include "php_globals.h"
 #include "php_variables.h"
+#include "modules.h"
 
 #include "SAPI.h"
 
@@ -88,6 +89,7 @@ extern int ap_php_optind;
 
 static int _print_module_info ( zend_module_entry *module, void *arg ) {
        php_printf("%s\n", module->name);
+       return 0;
 }
 
 static int sapi_cgibin_ub_write(const char *str, uint str_length)