summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJani Taskinen <jani@php.net>2007-07-21 01:41:55 +0000
committerJani Taskinen <jani@php.net>2007-07-21 01:41:55 +0000
commit562a0629e4de9343df3ca6e2dc40effb06d792d5 (patch)
tree2c0773845b8700ab5170647ffdbc6475a1f6a159
parentf8b56530b9318ff3d7b6262f3422753305d9b813 (diff)
downloadphp-git-562a0629e4de9343df3ca6e2dc40effb06d792d5.tar.gz
- Fix compile warnings
-rw-r--r--main/main.c8
-rw-r--r--main/php_open_temporary_file.c2
-rw-r--r--main/php_open_temporary_file.h2
-rwxr-xr-xmain/php_streams.h2
-rw-r--r--main/streams/filter.c2
5 files changed, 8 insertions, 8 deletions
diff --git a/main/main.c b/main/main.c
index 57b993b105..11d4ea6da1 100644
--- a/main/main.c
+++ b/main/main.c
@@ -512,14 +512,14 @@ PHPAPI int php_printf(const char *format, ...)
/* {{{ php_verror helpers */
/* {{{ php_during_module_startup */
-static int php_during_module_startup()
+static int php_during_module_startup(void)
{
return module_startup;
}
/* }}} */
/* {{{ php_during_module_shutdown */
-static int php_during_module_shutdown()
+static int php_during_module_shutdown(void)
{
return module_shutdown;
}
@@ -1869,7 +1869,7 @@ int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_mod
}
/* }}} */
-void php_module_shutdown_for_exec()
+void php_module_shutdown_for_exec(void)
{
/* used to close fd's in the range 3.255 here, but it's problematic */
}
@@ -2165,7 +2165,7 @@ PHPAPI int php_lint_script(zend_file_handle *file TSRMLS_DC)
#ifdef PHP_WIN32
/* {{{ dummy_indent
just so that this symbol gets exported... */
-PHPAPI void dummy_indent()
+PHPAPI void dummy_indent(void)
{
zend_indent();
}
diff --git a/main/php_open_temporary_file.c b/main/php_open_temporary_file.c
index c7f78ac7c2..4412cc0d06 100644
--- a/main/php_open_temporary_file.c
+++ b/main/php_open_temporary_file.c
@@ -151,7 +151,7 @@ static int php_do_open_temporary_file(const char *path, const char *pfx, char **
/* Cache the chosen temporary directory. */
static char* temporary_directory;
-PHPAPI void php_shutdown_temporary_directory()
+PHPAPI void php_shutdown_temporary_directory(void)
{
if (temporary_directory) {
free(temporary_directory);
diff --git a/main/php_open_temporary_file.h b/main/php_open_temporary_file.h
index 9565fcd6ca..53f08d30f7 100644
--- a/main/php_open_temporary_file.h
+++ b/main/php_open_temporary_file.h
@@ -25,7 +25,7 @@ BEGIN_EXTERN_C()
PHPAPI FILE *php_open_temporary_file(const char *dir, const char *pfx, char **opened_path_p TSRMLS_DC);
PHPAPI int php_open_temporary_fd(const char *dir, const char *pfx, char **opened_path_p TSRMLS_DC);
PHPAPI const char *php_get_temporary_directory(void);
-PHPAPI void php_shutdown_temporary_directory();
+PHPAPI void php_shutdown_temporary_directory(void);
END_EXTERN_C()
#endif /* PHP_OPEN_TEMPORARY_FILE_H */
diff --git a/main/php_streams.h b/main/php_streams.h
index ad57bbb975..94ec452e60 100755
--- a/main/php_streams.h
+++ b/main/php_streams.h
@@ -681,7 +681,7 @@ PHPAPI HashTable *_php_stream_get_url_stream_wrappers_hash(TSRMLS_D);
PHPAPI HashTable *php_stream_get_url_stream_wrappers_hash_global(void);
PHPAPI HashTable *_php_get_stream_filters_hash(TSRMLS_D);
#define php_get_stream_filters_hash() _php_get_stream_filters_hash(TSRMLS_C)
-PHPAPI HashTable *php_get_stream_filters_hash_global();
+PHPAPI HashTable *php_get_stream_filters_hash_global(void);
extern php_stream_wrapper_ops *php_stream_user_wrapper_ops;
END_EXTERN_C()
#endif
diff --git a/main/streams/filter.c b/main/streams/filter.c
index 661af93c18..b1d9df4e05 100644
--- a/main/streams/filter.c
+++ b/main/streams/filter.c
@@ -32,7 +32,7 @@
static HashTable stream_filters_hash;
/* Should only be used during core initialization */
-PHPAPI HashTable *php_get_stream_filters_hash_global()
+PHPAPI HashTable *php_get_stream_filters_hash_global(void)
{
return &stream_filters_hash;
}