cvs: /php4 php_ini.h /php4/ext/mysql mysql.c

zeev Sat Aug 14 06:04:05 1999 EDT Modified files: /php4 php_ini.h /php4/ext/mysql mysql.c Log: Fix thread unsafe version Index: php4/php_ini.h diff -u php4/php_ini.h:1.13 php4/php_ini.h:1.14 --- php4/php_ini.h:1.13 Fri Aug 13 17:03:26 1999 +++ php4/php_ini.h Sat Aug 14 06:04:04 1999 @@ -108,7 +108,7 @@ #else #define STD_PHP_INI_ENTRY(name, default_value, modifyable, on_modify, property_name, struct_type, struct_ptr) \ PHP_INI_ENTRY2(name, default_value, modifyable, on_modify, (void *) XtOffsetOf(struct_type, property_name), (void *) &struct_ptr) -#define STD_PHP_INI_ENTRY_EX(name, default_value, modifyable, on_modify, property_name, struct_type, struct_ptr, display) \ +#define STD_PHP_INI_ENTRY_EX(name, default_value, modifyable, on_modify, property_name, struct_type, struct_ptr, displayer) \ PHP_INI_ENTRY2_EX(name, default_value, modifyable, on_modify, (void *) XtOffsetOf(struct_type, property_name), (void *) &struct_ptr, displayer) #define STD_PHP_INI_BOOLEAN(name, default_value, modifyable, on_modify, property_name, struct_type, struct_ptr) \ PHP_INI_ENTRY3_EX(name, default_value, modifyable, on_modify, (void *) XtOffsetOf(struct_type, property_name), (void *) &struct_ptr, NULL, php_ini_boolean_displayer_cb) Index: php4/ext/mysql/mysql.c diff -u php4/ext/mysql/mysql.c:1.18 php4/ext/mysql/mysql.c:1.19 --- php4/ext/mysql/mysql.c:1.18 Fri Aug 13 17:03:27 1999 +++ php4/ext/mysql/mysql.c Sat Aug 14 06:04:04 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: mysql.c,v 1.18 1999/08/13 21:03:27 zeev Exp $ */ +/* $Id: mysql.c,v 1.19 1999/08/14 10:04:04 zeev Exp $ */ /* TODO: @@ -271,7 +271,7 @@ PHP_INI_BEGIN() STD_PHP_INI_BOOLEAN("mysql.allow_persistent", "1", PHP_INI_SYSTEM, OnUpdateInt, allow_persistent, php_mysql_globals, mysql_globals) STD_PHP_INI_ENTRY_EX("mysql.max_persistent", "-1", PHP_INI_SYSTEM, OnUpdateInt, max_persistent, php_mysql_globals, mysql_globals, display_link_numbers) - STD_PHP_INI_ENTRY_EX("mysql.max_links", "-1", PHP_INI_SYSTEM, OnUpdateInt, max_links, php_mysql_globals, mysql_globals, display_link_numbers) + STD_PHP_INI_ENTRY_EX("mysql.max_links", "-1", PHP_INI_SYSTEM, OnUpdateInt, max_links, php_mysql_globals, mysql_globals, display_link_numbers) STD_PHP_INI_ENTRY("mysql.default_host", NULL, PHP_INI_ALL, OnUpdateString, default_host, php_mysql_globals, mysql_globals) STD_PHP_INI_ENTRY("mysql.default_user", NULL, PHP_INI_ALL, OnUpdateString, default_user, php_mysql_globals, mysql_globals) STD_PHP_INI_ENTRY("mysql.default_password", NULL, PHP_INI_ALL, OnUpdateString, default_password, php_mysql_globals, mysql_globals) @@ -337,9 +337,9 @@ php_printf("<table border=5 width=\"600\">"); php_info_print_table_header(2, "Key", "Value"); - sprintf(buf, "%d", MySG(num_persistent)); + sprintf(buf, "%ld", MySG(num_persistent)); php_info_print_table_row(2, "Active Persistent Links", buf); - sprintf(buf, "%d", MySG(num_links)); + sprintf(buf, "%ld", MySG(num_links)); php_info_print_table_row(2, "Active Links", buf); php_info_print_table_row(2, "Client API version", mysql_get_client_info()); #if !(WIN32|WINNT)