cvs: ZendEngine2 / zend_constants.h zend_ini.h php-src/ext/mysqli php_mysqli.h php-src/ext/ncurses php_ncurses.h php-src/ext/session php_session.h

sniper Thu Jan 22 22:28:59 2004 EDT Modified files: /php-src/ext/mysqli php_mysqli.h /php-src/ext/ncurses php_ncurses.h /php-src/ext/session php_session.h /ZendEngine2 zend_constants.h zend_ini.h Log: Silence some compile warnings http://cvs.php.net/diff.php/php-src/ext/mysqli/php_mysqli.h?r1=1.28&r2=1.29&ty=u Index: php-src/ext/mysqli/php_mysqli.h diff -u php-src/ext/mysqli/php_mysqli.h:1.28 php-src/ext/mysqli/php_mysqli.h:1.29 --- php-src/ext/mysqli/php_mysqli.h:1.28 Thu Jan 8 12:32:31 2004 +++ php-src/ext/mysqli/php_mysqli.h Thu Jan 22 22:28:56 2004 @@ -15,7 +15,7 @@ | Author: Georg Richter <georg@php.net> | +----------------------------------------------------------------------+ - $Id: php_mysqli.h,v 1.28 2004/01/08 17:32:31 sniper Exp $ + $Id: php_mysqli.h,v 1.29 2004/01/23 03:28:56 sniper Exp $ */ /* A little hack to prevent build break, when mysql is used together with @@ -386,7 +386,7 @@ #define my_estrdup(x) (x) ? estrdup(x) : NULL #define my_efree(x) if (x) efree(x) -ZEND_EXTERN_MODULE_GLOBALS(mysqli); +ZEND_EXTERN_MODULE_GLOBALS(mysqli) #endif /* PHP_MYSQLI.H */ http://cvs.php.net/diff.php/php-src/ext/ncurses/php_ncurses.h?r1=1.15&r2=1.16&ty=u Index: php-src/ext/ncurses/php_ncurses.h diff -u php-src/ext/ncurses/php_ncurses.h:1.15 php-src/ext/ncurses/php_ncurses.h:1.16 --- php-src/ext/ncurses/php_ncurses.h:1.15 Thu Jan 8 12:32:31 2004 +++ php-src/ext/ncurses/php_ncurses.h Thu Jan 22 22:28:57 2004 @@ -70,7 +70,7 @@ #define NCURSES_LS_FETCH() #endif -ZEND_EXTERN_MODULE_GLOBALS(ncurses); +ZEND_EXTERN_MODULE_GLOBALS(ncurses) #endif /* PHP_NCURSES_H */ http://cvs.php.net/diff.php/php-src/ext/session/php_session.h?r1=1.97&r2=1.98&ty=u Index: php-src/ext/session/php_session.h diff -u php-src/ext/session/php_session.h:1.97 php-src/ext/session/php_session.h:1.98 --- php-src/ext/session/php_session.h:1.97 Fri Jan 9 10:30:07 2004 +++ php-src/ext/session/php_session.h Thu Jan 22 22:28:58 2004 @@ -228,7 +228,7 @@ } \ } -PHPAPI ZEND_EXTERN_MODULE_GLOBALS(ps); +PHPAPI ZEND_EXTERN_MODULE_GLOBALS(ps) void php_session_auto_start(void *data); void php_session_shutdown(void *data); http://cvs.php.net/diff.php/ZendEngine2/zend_constants.h?r1=1.28&r2=1.29&ty=u Index: ZendEngine2/zend_constants.h diff -u ZendEngine2/zend_constants.h:1.28 ZendEngine2/zend_constants.h:1.29 --- ZendEngine2/zend_constants.h:1.28 Thu Jan 8 12:31:47 2004 +++ ZendEngine2/zend_constants.h Thu Jan 22 22:28:59 2004 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_constants.h,v 1.28 2004/01/08 17:31:47 sniper Exp $ */ +/* $Id: zend_constants.h,v 1.29 2004/01/23 03:28:59 sniper Exp $ */ #ifndef ZEND_CONSTANTS_H #define ZEND_CONSTANTS_H @@ -62,7 +62,7 @@ ZEND_API int zend_register_constant(zend_constant *c TSRMLS_DC); void zend_copy_constants(HashTable *target, HashTable *sourc); void copy_zend_constant(zend_constant *c); -END_EXTERN_C(); +END_EXTERN_C() #define ZEND_CONSTANT_DTOR (void (*)(void *)) free_zend_constant http://cvs.php.net/diff.php/ZendEngine2/zend_ini.h?r1=1.30&r2=1.31&ty=u Index: ZendEngine2/zend_ini.h diff -u ZendEngine2/zend_ini.h:1.30 ZendEngine2/zend_ini.h:1.31 --- ZendEngine2/zend_ini.h:1.30 Thu Jan 8 12:31:47 2004 +++ ZendEngine2/zend_ini.h Thu Jan 22 22:28:59 2004 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_ini.h,v 1.30 2004/01/08 17:31:47 sniper Exp $ */ +/* $Id: zend_ini.h,v 1.31 2004/01/23 03:28:59 sniper Exp $ */ #ifndef ZEND_INI_H #define ZEND_INI_H @@ -82,7 +82,7 @@ void (*displayer)(zend_ini_entry *ini_entry, int type); }; -BEGIN_EXTERN_C(); +BEGIN_EXTERN_C() ZEND_API int zend_ini_startup(TSRMLS_D); ZEND_API int zend_ini_shutdown(TSRMLS_D); ZEND_API int zend_ini_global_shutdown(TSRMLS_D); @@ -108,7 +108,7 @@ ZEND_API ZEND_INI_DISP(zend_ini_boolean_displayer_cb); ZEND_API ZEND_INI_DISP(zend_ini_color_displayer_cb); ZEND_API ZEND_INI_DISP(display_link_numbers); -END_EXTERN_C(); +END_EXTERN_C() #define ZEND_INI_BEGIN() static zend_ini_entry ini_entries[] = { #define ZEND_INI_END() { 0, 0, NULL, 0, NULL, NULL, NULL, NULL, NULL, 0, NULL, 0, 0, NULL } }; @@ -172,13 +172,13 @@ #define REGISTER_INI_BOOLEAN(name) REGISTER_INI_DISPLAYER(name, zend_ini_boolean_displayer_cb) /* Standard message handlers */ -BEGIN_EXTERN_C(); +BEGIN_EXTERN_C() ZEND_API ZEND_INI_MH(OnUpdateBool); ZEND_API ZEND_INI_MH(OnUpdateLong); ZEND_API ZEND_INI_MH(OnUpdateReal); ZEND_API ZEND_INI_MH(OnUpdateString); ZEND_API ZEND_INI_MH(OnUpdateStringUnempty); -END_EXTERN_C(); +END_EXTERN_C() #define ZEND_INI_DISPLAY_ORIG 1 #define ZEND_INI_DISPLAY_ACTIVE 2 @@ -191,9 +191,9 @@ /* INI parsing engine */ typedef void (*zend_ini_parser_cb_t)(zval *arg1, zval *arg2, int callback_type, void *arg); -BEGIN_EXTERN_C(); +BEGIN_EXTERN_C() int zend_parse_ini_file(zend_file_handle *fh, zend_bool unbuffered_errors, zend_ini_parser_cb_t ini_parser_cb, void *arg); -END_EXTERN_C(); +END_EXTERN_C() #define ZEND_INI_PARSER_ENTRY 1 #define ZEND_INI_PARSER_SECTION 2