diff options
| -rw-r--r-- | ext/apache/apache.c | 3 | ||||
| -rw-r--r-- | ext/gd/gd.c | 3 | ||||
| -rw-r--r-- | ext/gd/php3_gd.h | 2 | ||||
| -rw-r--r-- | ext/standard/post.c | 2 | ||||
| -rw-r--r-- | main/php_ini.h | 2 | ||||
| -rw-r--r-- | request_info.c | 2 |
6 files changed, 8 insertions, 6 deletions
diff --git a/ext/apache/apache.c b/ext/apache/apache.c index d3a390eba6..b174262060 100644 --- a/ext/apache/apache.c +++ b/ext/apache/apache.c @@ -154,7 +154,8 @@ void php3_apache_note(INTERNAL_FUNCTION_PARAMETERS) } /* }}} */ -void php3_info_apache(ZEND_MODULE_INFO_FUNC_ARGS) { +void php3_info_apache(ZEND_MODULE_INFO_FUNC_ARGS) +{ module *modp = NULL; #if !defined(WIN32) && !defined(WINNT) char name[64]; diff --git a/ext/gd/gd.c b/ext/gd/gd.c index f71b129a17..9dd0ef3a89 100644 --- a/ext/gd/gd.c +++ b/ext/gd/gd.c @@ -178,7 +178,8 @@ int php3_minit_gd(INIT_FUNC_ARGS) return SUCCESS; } -void php3_info_gd(ZEND_MODULE_INFO_FUNC_ARGS) { +void php3_info_gd(ZEND_MODULE_INFO_FUNC_ARGS) +{ /* need to use a PHPAPI function here because it is external module in windows */ #if HAVE_LIBGD13 php3_printf("Version 1.3"); diff --git a/ext/gd/php3_gd.h b/ext/gd/php3_gd.h index ea25c06aca..c0a9027230 100644 --- a/ext/gd/php3_gd.h +++ b/ext/gd/php3_gd.h @@ -47,7 +47,7 @@ extern php3_module_entry gd_module_entry; #define phpext_gd_ptr &gd_module_entry /* gd.c functions */ -extern void php3_info_gd(void); +extern void php3_info_gd(ZEND_MODULE_INFO_FUNC_ARGS); extern int php3_minit_gd(INIT_FUNC_ARGS); extern int php3_mend_gd(SHUTDOWN_FUNC_ARGS); extern int gdImageColorResolve(gdImagePtr, int, int, int); diff --git a/ext/standard/post.c b/ext/standard/post.c index 7be502ff69..7edcc70788 100644 --- a/ext/standard/post.c +++ b/ext/standard/post.c @@ -42,7 +42,7 @@ * This reads the post form data into a string. * Remember to free this pointer when done with it. */ -#if APACHE +#if 0 static char *php3_getpost(pval *http_post_vars PLS_DC) { char *buf = NULL; diff --git a/main/php_ini.h b/main/php_ini.h index de9a994858..09a9f62c1b 100644 --- a/main/php_ini.h +++ b/main/php_ini.h @@ -102,7 +102,7 @@ PHPAPI PHP_INI_DISP(php_ini_color_displayer_cb); #define REGISTER_INI_ENTRIES() php_register_ini_entries(ini_entries, module_number) #define UNREGISTER_INI_ENTRIES() php_unregister_ini_entries(module_number) -#define DISPLAY_INI_ENTRIES() display_ini_entries(module) +#define DISPLAY_INI_ENTRIES() display_ini_entries(zend_module) #define REGISTER_INI_DISPLAYER(name, displayer) php_ini_register_displayer((name), sizeof(name), displayer) #define REGISTER_INI_BOOLEAN(name) REGISTER_INI_DISPLAYER(name, php_ini_boolean_displayer_cb) diff --git a/request_info.c b/request_info.c index 86a56f7c30..884b184c31 100644 --- a/request_info.c +++ b/request_info.c @@ -105,7 +105,7 @@ int php3_init_request_info(void *conf) request_info.filename = r->filename; SG(request_info).request_method = r->method; - request_info.content_type = table_get(r->subprocess_env, "CONTENT_TYPE"); + SG(request_info).content_type = table_get(r->subprocess_env, "CONTENT_TYPE"); buf = table_get(r->subprocess_env, "CONTENT_LENGTH"); SG(request_info).content_length = (buf ? atoi(buf) : 0); |