summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorSascha Schumann <sas@php.net>1999-12-05 16:25:32 +0000
committerSascha Schumann <sas@php.net>1999-12-05 16:25:32 +0000
commit4a60eed46934950013039f8ca26b7c61f3d06d39 (patch)
tree5357b89373e1b5ea49dde2bae76cacfe94eba228 /main
parent9417570dc1f31a0e3ddb9f6736a547c87ce7cfba (diff)
downloadphp-git-4a60eed46934950013039f8ca26b7c61f3d06d39.tar.gz
Fix some warnings
Diffstat (limited to 'main')
-rw-r--r--main/SAPI.c2
-rw-r--r--main/main.c10
-rw-r--r--main/rfc1867.c2
3 files changed, 7 insertions, 7 deletions
diff --git a/main/SAPI.c b/main/SAPI.c
index 207eb9e6b8..01be19857e 100644
--- a/main/SAPI.c
+++ b/main/SAPI.c
@@ -79,7 +79,7 @@ SAPI_API void sapi_startup(sapi_module_struct *sf)
module_global_startup_modules();
}
-SAPI_API void sapi_shutdown()
+SAPI_API void sapi_shutdown(void)
{
module_global_shutdown_modules();
zend_hash_destroy(&known_post_content_types);
diff --git a/main/main.c b/main/main.c
index ce8e0ff230..08674d470a 100644
--- a/main/main.c
+++ b/main/main.c
@@ -523,7 +523,7 @@ static void php_set_timeout(long seconds)
}
-static void php_unset_timeout()
+static void php_unset_timeout(void)
{
#if WIN32|WINNT
#else
@@ -778,7 +778,7 @@ void php_request_shutdown_for_exec(void *dummy)
}
-int return_one(void *p)
+static int return_one(void *p)
{
return 1;
}
@@ -817,7 +817,7 @@ void php_request_shutdown(void *dummy)
}
-static int php3_config_ini_startup()
+static int php3_config_ini_startup(void)
{
if (php3_init_config() == FAILURE) {
php_printf("PHP: Unable to parse configuration file.\n");
@@ -826,7 +826,7 @@ static int php3_config_ini_startup()
return SUCCESS;
}
-static void php3_config_ini_shutdown()
+static void php3_config_ini_shutdown(void)
{
php3_shutdown_config();
}
@@ -895,7 +895,7 @@ int php_module_startup(sapi_module_struct *sf)
#ifdef ZTS
tsrm_set_new_thread_end_handler(php_new_thread_end_handler);
executor_globals = ts_resource(executor_globals_id);
- core_globals_id = ts_allocate_id(sizeof(php_core_globals), core_globals_ctor, NULL);
+ core_globals_id = ts_allocate_id(sizeof(php_core_globals), (ts_allocate_ctor) core_globals_ctor, NULL);
core_globals = ts_resource(core_globals_id);
#endif
EG(error_reporting) = E_ALL & ~E_NOTICE;
diff --git a/main/rfc1867.c b/main/rfc1867.c
index 2ddd66d467..ea80949393 100644
--- a/main/rfc1867.c
+++ b/main/rfc1867.c
@@ -32,7 +32,7 @@
/*
* Split raw mime stream up into appropriate components
*/
-void php_mime_split(char *buf, int cnt, char *boundary)
+static void php_mime_split(char *buf, int cnt, char *boundary)
{
char *ptr, *loc, *loc2, *s, *name, *filename, *u, *fn;
int len, state = 0, Done = 0, rem, urem;