MFB: Move declarations from the public header file.

diff --git a/ext/mysqli/php_mysqli.h b/ext/mysqli/php_mysqli.h
index 0a732c733359721afa8d93bf58d536f11954ffbe..4c05fd85edf3ac3771c565859e7468ac81785c99 100644 (file)
--- a/ext/mysqli/php_mysqli.h
+++ b/ext/mysqli/php_mysqli.h
@@ -23,127 +23,6 @@
 #ifndef PHP_MYSQLI_H
 #define PHP_MYSQLI_H
 
-
-PHP_MINIT_FUNCTION(mysqli);
-PHP_MSHUTDOWN_FUNCTION(mysqli);
-PHP_RINIT_FUNCTION(mysqli);
-PHP_RSHUTDOWN_FUNCTION(mysqli);
-PHP_MINFO_FUNCTION(mysqli);
-
-PHP_FUNCTION(mysqli);
-PHP_FUNCTION(mysqli_affected_rows);
-PHP_FUNCTION(mysqli_autocommit);
-PHP_FUNCTION(mysqli_change_user);
-PHP_FUNCTION(mysqli_character_set_name);
-PHP_FUNCTION(mysqli_set_charset);
-PHP_FUNCTION(mysqli_close);
-PHP_FUNCTION(mysqli_commit);
-PHP_FUNCTION(mysqli_connect);
-PHP_FUNCTION(mysqli_connect_errno);
-PHP_FUNCTION(mysqli_connect_error);
-PHP_FUNCTION(mysqli_data_seek);
-PHP_FUNCTION(mysqli_debug);
-PHP_FUNCTION(mysqli_disable_reads_from_master);
-PHP_FUNCTION(mysqli_disable_rpl_parse);
-PHP_FUNCTION(mysqli_dump_debug_info);
-PHP_FUNCTION(mysqli_enable_reads_from_master);
-PHP_FUNCTION(mysqli_enable_rpl_parse);
-PHP_FUNCTION(mysqli_errno);
-PHP_FUNCTION(mysqli_error);
-PHP_FUNCTION(mysqli_fetch_all);
-PHP_FUNCTION(mysqli_fetch_array);
-PHP_FUNCTION(mysqli_fetch_assoc);
-PHP_FUNCTION(mysqli_fetch_object);
-PHP_FUNCTION(mysqli_fetch_field);
-PHP_FUNCTION(mysqli_fetch_fields);
-PHP_FUNCTION(mysqli_fetch_field_direct);
-PHP_FUNCTION(mysqli_fetch_lengths);
-PHP_FUNCTION(mysqli_fetch_row);
-PHP_FUNCTION(mysqli_field_count);
-PHP_FUNCTION(mysqli_field_seek);
-PHP_FUNCTION(mysqli_field_tell);
-PHP_FUNCTION(mysqli_free_result);
-PHP_FUNCTION(mysqli_get_cache_stats);
-PHP_FUNCTION(mysqli_get_client_stats);
-PHP_FUNCTION(mysqli_get_connection_stats);
-PHP_FUNCTION(mysqli_get_charset);
-PHP_FUNCTION(mysqli_get_client_info);
-PHP_FUNCTION(mysqli_get_client_version);
-PHP_FUNCTION(mysqli_get_host_info);
-PHP_FUNCTION(mysqli_get_proto_info);
-PHP_FUNCTION(mysqli_get_server_info);
-PHP_FUNCTION(mysqli_get_server_version);
-PHP_FUNCTION(mysqli_get_warnings);
-PHP_FUNCTION(mysqli_info);
-PHP_FUNCTION(mysqli_insert_id);
-PHP_FUNCTION(mysqli_init);
-PHP_FUNCTION(mysqli_kill);
-PHP_FUNCTION(mysqli_set_local_infile_default);
-PHP_FUNCTION(mysqli_set_local_infile_handler);
-PHP_FUNCTION(mysqli_master_query);
-PHP_FUNCTION(mysqli_more_results);
-PHP_FUNCTION(mysqli_multi_query);
-PHP_FUNCTION(mysqli_next_result);
-PHP_FUNCTION(mysqli_num_fields);
-PHP_FUNCTION(mysqli_num_rows);
-PHP_FUNCTION(mysqli_options);
-PHP_FUNCTION(mysqli_ping);
-PHP_FUNCTION(mysqli_prepare);
-PHP_FUNCTION(mysqli_query);
-PHP_FUNCTION(mysqli_stmt_result_metadata);
-PHP_FUNCTION(mysqli_report);
-PHP_FUNCTION(mysqli_read_query_result);
-PHP_FUNCTION(mysqli_real_connect);
-PHP_FUNCTION(mysqli_real_query);
-PHP_FUNCTION(mysqli_real_escape_string);
-PHP_FUNCTION(mysqli_rollback);
-PHP_FUNCTION(mysqli_row_seek);
-PHP_FUNCTION(mysqli_rpl_parse_enabled);
-PHP_FUNCTION(mysqli_rpl_probe);
-PHP_FUNCTION(mysqli_rpl_query_type);
-PHP_FUNCTION(mysqli_select_db);
-PHP_FUNCTION(mysqli_stmt_attr_get);
-PHP_FUNCTION(mysqli_stmt_attr_set);
-PHP_FUNCTION(mysqli_stmt_bind_param);
-PHP_FUNCTION(mysqli_stmt_bind_result);
-PHP_FUNCTION(mysqli_stmt_execute);
-PHP_FUNCTION(mysqli_stmt_field_count);
-PHP_FUNCTION(mysqli_stmt_init);
-PHP_FUNCTION(mysqli_stmt_prepare);
-PHP_FUNCTION(mysqli_stmt_fetch);
-PHP_FUNCTION(mysqli_stmt_param_count);
-PHP_FUNCTION(mysqli_stmt_send_long_data);
-PHP_FUNCTION(mysqli_send_query);
-PHP_FUNCTION(mysqli_embedded_server_end);
-PHP_FUNCTION(mysqli_embedded_server_start);
-PHP_FUNCTION(mysqli_slave_query);
-PHP_FUNCTION(mysqli_sqlstate);
-PHP_FUNCTION(mysqli_ssl_set);
-PHP_FUNCTION(mysqli_stat);
-PHP_FUNCTION(mysqli_stmt_affected_rows);
-PHP_FUNCTION(mysqli_stmt_close);
-PHP_FUNCTION(mysqli_stmt_data_seek);
-PHP_FUNCTION(mysqli_stmt_errno);
-PHP_FUNCTION(mysqli_stmt_error);
-PHP_FUNCTION(mysqli_stmt_free_result);
-PHP_FUNCTION(mysqli_stmt_get_result);
-PHP_FUNCTION(mysqli_stmt_get_warnings);
-PHP_FUNCTION(mysqli_stmt_reset);
-PHP_FUNCTION(mysqli_stmt_insert_id);
-PHP_FUNCTION(mysqli_stmt_num_rows);
-PHP_FUNCTION(mysqli_stmt_sqlstate);
-PHP_FUNCTION(mysqli_stmt_store_result);
-PHP_FUNCTION(mysqli_store_result);
-PHP_FUNCTION(mysqli_thread_id);
-PHP_FUNCTION(mysqli_thread_safe);
-PHP_FUNCTION(mysqli_use_result);
-PHP_FUNCTION(mysqli_warning_count);
-
-ZEND_FUNCTION(mysqli_stmt_construct);
-ZEND_FUNCTION(mysqli_result_construct);
-ZEND_FUNCTION(mysqli_driver_construct);
-ZEND_METHOD(mysqli_warning,__construct);
-
 #define phpext_mysqli_ptr &mysqli_module_entry
 extern zend_module_entry mysqli_module_entry;
 

diff --git a/ext/mysqli/php_mysqli_structs.h b/ext/mysqli/php_mysqli_structs.h
index 17997053eb8bea03f7c2716ced9b241112ae3434..574746f6b9b3694f097d14b8471e6b2e3ab6af49 100644 (file)
--- a/ext/mysqli/php_mysqli_structs.h
+++ b/ext/mysqli/php_mysqli_structs.h
@@ -395,6 +395,127 @@ MYSQLI_PROPERTY(my_prop_link_host);
 
 ZEND_EXTERN_MODULE_GLOBALS(mysqli)
 
+
+PHP_MINIT_FUNCTION(mysqli);
+PHP_MSHUTDOWN_FUNCTION(mysqli);
+PHP_RINIT_FUNCTION(mysqli);
+PHP_RSHUTDOWN_FUNCTION(mysqli);
+PHP_MINFO_FUNCTION(mysqli);
+
+PHP_FUNCTION(mysqli);
+PHP_FUNCTION(mysqli_affected_rows);
+PHP_FUNCTION(mysqli_autocommit);
+PHP_FUNCTION(mysqli_change_user);
+PHP_FUNCTION(mysqli_character_set_name);
+PHP_FUNCTION(mysqli_set_charset);
+PHP_FUNCTION(mysqli_close);
+PHP_FUNCTION(mysqli_commit);
+PHP_FUNCTION(mysqli_connect);
+PHP_FUNCTION(mysqli_connect_errno);
+PHP_FUNCTION(mysqli_connect_error);
+PHP_FUNCTION(mysqli_data_seek);
+PHP_FUNCTION(mysqli_debug);
+PHP_FUNCTION(mysqli_disable_reads_from_master);
+PHP_FUNCTION(mysqli_disable_rpl_parse);
+PHP_FUNCTION(mysqli_dump_debug_info);
+PHP_FUNCTION(mysqli_enable_reads_from_master);
+PHP_FUNCTION(mysqli_enable_rpl_parse);
+PHP_FUNCTION(mysqli_errno);
+PHP_FUNCTION(mysqli_error);
+PHP_FUNCTION(mysqli_fetch_all);
+PHP_FUNCTION(mysqli_fetch_array);
+PHP_FUNCTION(mysqli_fetch_assoc);
+PHP_FUNCTION(mysqli_fetch_object);
+PHP_FUNCTION(mysqli_fetch_field);
+PHP_FUNCTION(mysqli_fetch_fields);
+PHP_FUNCTION(mysqli_fetch_field_direct);
+PHP_FUNCTION(mysqli_fetch_lengths);
+PHP_FUNCTION(mysqli_fetch_row);
+PHP_FUNCTION(mysqli_field_count);
+PHP_FUNCTION(mysqli_field_seek);
+PHP_FUNCTION(mysqli_field_tell);
+PHP_FUNCTION(mysqli_free_result);
+PHP_FUNCTION(mysqli_get_cache_stats);
+PHP_FUNCTION(mysqli_get_client_stats);
+PHP_FUNCTION(mysqli_get_connection_stats);
+PHP_FUNCTION(mysqli_get_charset);
+PHP_FUNCTION(mysqli_get_client_info);
+PHP_FUNCTION(mysqli_get_client_version);
+PHP_FUNCTION(mysqli_get_host_info);
+PHP_FUNCTION(mysqli_get_proto_info);
+PHP_FUNCTION(mysqli_get_server_info);
+PHP_FUNCTION(mysqli_get_server_version);
+PHP_FUNCTION(mysqli_get_warnings);
+PHP_FUNCTION(mysqli_info);
+PHP_FUNCTION(mysqli_insert_id);
+PHP_FUNCTION(mysqli_init);
+PHP_FUNCTION(mysqli_kill);
+PHP_FUNCTION(mysqli_set_local_infile_default);
+PHP_FUNCTION(mysqli_set_local_infile_handler);
+PHP_FUNCTION(mysqli_master_query);
+PHP_FUNCTION(mysqli_more_results);
+PHP_FUNCTION(mysqli_multi_query);
+PHP_FUNCTION(mysqli_next_result);
+PHP_FUNCTION(mysqli_num_fields);
+PHP_FUNCTION(mysqli_num_rows);
+PHP_FUNCTION(mysqli_options);
+PHP_FUNCTION(mysqli_ping);
+PHP_FUNCTION(mysqli_prepare);
+PHP_FUNCTION(mysqli_query);
+PHP_FUNCTION(mysqli_stmt_result_metadata);
+PHP_FUNCTION(mysqli_report);
+PHP_FUNCTION(mysqli_read_query_result);
+PHP_FUNCTION(mysqli_real_connect);
+PHP_FUNCTION(mysqli_real_query);
+PHP_FUNCTION(mysqli_real_escape_string);
+PHP_FUNCTION(mysqli_rollback);
+PHP_FUNCTION(mysqli_row_seek);
+PHP_FUNCTION(mysqli_rpl_parse_enabled);
+PHP_FUNCTION(mysqli_rpl_probe);
+PHP_FUNCTION(mysqli_rpl_query_type);
+PHP_FUNCTION(mysqli_select_db);
+PHP_FUNCTION(mysqli_stmt_attr_get);
+PHP_FUNCTION(mysqli_stmt_attr_set);
+PHP_FUNCTION(mysqli_stmt_bind_param);
+PHP_FUNCTION(mysqli_stmt_bind_result);
+PHP_FUNCTION(mysqli_stmt_execute);
+PHP_FUNCTION(mysqli_stmt_field_count);
+PHP_FUNCTION(mysqli_stmt_init);
+PHP_FUNCTION(mysqli_stmt_prepare);
+PHP_FUNCTION(mysqli_stmt_fetch);
+PHP_FUNCTION(mysqli_stmt_param_count);
+PHP_FUNCTION(mysqli_stmt_send_long_data);
+PHP_FUNCTION(mysqli_send_query);
+PHP_FUNCTION(mysqli_embedded_server_end);
+PHP_FUNCTION(mysqli_embedded_server_start);
+PHP_FUNCTION(mysqli_slave_query);
+PHP_FUNCTION(mysqli_sqlstate);
+PHP_FUNCTION(mysqli_ssl_set);
+PHP_FUNCTION(mysqli_stat);
+PHP_FUNCTION(mysqli_stmt_affected_rows);
+PHP_FUNCTION(mysqli_stmt_close);
+PHP_FUNCTION(mysqli_stmt_data_seek);
+PHP_FUNCTION(mysqli_stmt_errno);
+PHP_FUNCTION(mysqli_stmt_error);
+PHP_FUNCTION(mysqli_stmt_free_result);
+PHP_FUNCTION(mysqli_stmt_get_result);
+PHP_FUNCTION(mysqli_stmt_get_warnings);
+PHP_FUNCTION(mysqli_stmt_reset);
+PHP_FUNCTION(mysqli_stmt_insert_id);
+PHP_FUNCTION(mysqli_stmt_num_rows);
+PHP_FUNCTION(mysqli_stmt_sqlstate);
+PHP_FUNCTION(mysqli_stmt_store_result);
+PHP_FUNCTION(mysqli_store_result);
+PHP_FUNCTION(mysqli_thread_id);
+PHP_FUNCTION(mysqli_thread_safe);
+PHP_FUNCTION(mysqli_use_result);
+PHP_FUNCTION(mysqli_warning_count);
+
+ZEND_FUNCTION(mysqli_stmt_construct);
+ZEND_FUNCTION(mysqli_result_construct);
+ZEND_FUNCTION(mysqli_driver_construct);
+ZEND_METHOD(mysqli_warning,__construct);
+
 #endif /* PHP_MYSQLI_STRUCTS.H */