jani Sat Jul 21 01:41:55 2007 UTC Modified files: /php-src/main main.c php_open_temporary_file.c php_open_temporary_file.h php_streams.h /php-src/main/streams filter.c Log: - Fix compile warnings http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.737&r2=1.738&diff_format=u Index: php-src/main/main.c diff -u php-src/main/main.c:1.737 php-src/main/main.c:1.738 --- php-src/main/main.c:1.737 Sun Jul 15 15:20:29 2007 +++ php-src/main/main.c Sat Jul 21 01:41:55 2007 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: main.c,v 1.737 2007/07/15 15:20:29 jani Exp $ */ +/* $Id: main.c,v 1.738 2007/07/21 01:41:55 jani Exp $ */ /* {{{ includes */ @@ -512,14 +512,14 @@ /* {{{ 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 @@ } /* }}} */ -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 @@ #ifdef PHP_WIN32 /* {{{ dummy_indent just so that this symbol gets exported... */ -PHPAPI void dummy_indent() +PHPAPI void dummy_indent(void) { zend_indent(); } http://cvs.php.net/viewvc.cgi/php-src/main/php_open_temporary_file.c?r1=1.42&r2=1.43&diff_format=u Index: php-src/main/php_open_temporary_file.c diff -u php-src/main/php_open_temporary_file.c:1.42 php-src/main/php_open_temporary_file.c:1.43 --- php-src/main/php_open_temporary_file.c:1.42 Tue Feb 6 17:35:42 2007 +++ php-src/main/php_open_temporary_file.c Sat Jul 21 01:41:55 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_open_temporary_file.c,v 1.42 2007/02/06 17:35:42 tony2001 Exp $ */ +/* $Id: php_open_temporary_file.c,v 1.43 2007/07/21 01:41:55 jani Exp $ */ #include "php.h" @@ -151,7 +151,7 @@ /* 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); http://cvs.php.net/viewvc.cgi/php-src/main/php_open_temporary_file.h?r1=1.16&r2=1.17&diff_format=u Index: php-src/main/php_open_temporary_file.h diff -u php-src/main/php_open_temporary_file.h:1.16 php-src/main/php_open_temporary_file.h:1.17 --- php-src/main/php_open_temporary_file.h:1.16 Sat Feb 3 14:57:24 2007 +++ php-src/main/php_open_temporary_file.h Sat Jul 21 01:41:55 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_open_temporary_file.h,v 1.16 2007/02/03 14:57:24 helly Exp $ */ +/* $Id: php_open_temporary_file.h,v 1.17 2007/07/21 01:41:55 jani Exp $ */ #ifndef PHP_OPEN_TEMPORARY_FILE_H #define PHP_OPEN_TEMPORARY_FILE_H @@ -25,7 +25,7 @@ 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 */ http://cvs.php.net/viewvc.cgi/php-src/main/php_streams.h?r1=1.130&r2=1.131&diff_format=u Index: php-src/main/php_streams.h diff -u php-src/main/php_streams.h:1.130 php-src/main/php_streams.h:1.131 --- php-src/main/php_streams.h:1.130 Mon Jul 9 16:42:45 2007 +++ php-src/main/php_streams.h Sat Jul 21 01:41:55 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_streams.h,v 1.130 2007/07/09 16:42:45 dmitry Exp $ */ +/* $Id: php_streams.h,v 1.131 2007/07/21 01:41:55 jani Exp $ */ #ifndef PHP_STREAMS_H #define PHP_STREAMS_H @@ -681,7 +681,7 @@ 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 http://cvs.php.net/viewvc.cgi/php-src/main/streams/filter.c?r1=1.42&r2=1.43&diff_format=u Index: php-src/main/streams/filter.c diff -u php-src/main/streams/filter.c:1.42 php-src/main/streams/filter.c:1.43 --- php-src/main/streams/filter.c:1.42 Mon Jan 15 14:59:40 2007 +++ php-src/main/streams/filter.c Sat Jul 21 01:41:55 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: filter.c,v 1.42 2007/01/15 14:59:40 tony2001 Exp $ */ +/* $Id: filter.c,v 1.43 2007/07/21 01:41:55 jani Exp $ */ #include "php.h" #include "php_globals.h" @@ -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; }
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php