summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndi Gutmans <andi@php.net>2000-10-26 23:50:17 +0000
committerAndi Gutmans <andi@php.net>2000-10-26 23:50:17 +0000
commit2946f87f00806f9324763549bbde35d8ffdd51b4 (patch)
tree8d03f2e15416064c2cc4240af4d7ae2b86ae60d7
parent717e934a88fd366f7328aeef51460a468fa69f00 (diff)
downloadphp-git-2946f87f00806f9324763549bbde35d8ffdd51b4.tar.gz
- Fix new -m on Windows
-rw-r--r--Zend/zend_API.c2
-rw-r--r--Zend/zend_modules.h2
-rw-r--r--sapi/cgi/cgi_main.c2
3 files changed, 4 insertions, 2 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index 984ac63c19..761e1b142e 100644
--- 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 a2906b42ab..0dd01306c8 100644
--- 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 5002803aee..7038f2dead 100644
--- 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)