1 files changed, 11 insertions, 20 deletions

diff --git a/ext/mysqli/php_mysqli_structs.h b/ext/mysqli/php_mysqli_structs.h
index 16ed9ddefc..5a80e2f6bf 100644
--- a/ext/mysqli/php_mysqli_structs.h
+++ b/ext/mysqli/php_mysqli_structs.h
@@ -46,6 +46,7 @@ typedef _Bool		my_bool;
 #include <errmsg.h>
 #include <mysqld_error.h>
 #include "mysqli_libmysql.h"
+
 #endif /* MYSQLI_USE_MYSQLND */
 
 
@@ -88,7 +89,7 @@ typedef struct {
 	zval			li_read;
 	php_stream		*li_stream;
 	unsigned int 	multi_query;
-	zend_bool		persistent;
+	bool		persistent;
 #ifdef MYSQLI_USE_MYSQLND
 	int				async_result_fetch_type;
 #endif
@@ -124,7 +125,7 @@ struct st_mysqli_warning {
 typedef struct _mysqli_property_entry {
 	const char *pname;
 	size_t pname_length;
-	int (*r_func)(mysqli_object *obj, zval *retval, zend_bool quiet);
+	int (*r_func)(mysqli_object *obj, zval *retval, bool quiet);
 	int (*w_func)(mysqli_object *obj, zval *value);
 } mysqli_property_entry;
 
@@ -186,13 +187,6 @@ extern void php_mysqli_fetch_into_hash_aux(zval *return_value, MYSQL_RES * resul
 	mysql->multi_query = 1; \
 }
 
-#define REGISTER_MYSQLI_CLASS_ENTRY(name, mysqli_entry, class_functions) { \
-	zend_class_entry ce; \
-	INIT_CLASS_ENTRY(ce, name,class_functions); \
-	ce.create_object = mysqli_objects_new; \
-	mysqli_entry = zend_register_internal_class(&ce); \
-} \
-
 #define MYSQLI_REGISTER_RESOURCE_EX(__ptr, __zval)  \
 	(Z_MYSQLI_P(__zval))->ptr = __ptr;
 
@@ -269,27 +263,24 @@ extern void php_mysqli_fetch_into_hash_aux(zval *return_value, MYSQL_RES * resul
 
 
 ZEND_BEGIN_MODULE_GLOBALS(mysqli)
-	zend_long			default_link;
 	zend_long			num_links;
 	zend_long			max_links;
 	zend_long 			num_active_persistent;
 	zend_long 			num_inactive_persistent;
 	zend_long			max_persistent;
 	zend_long			allow_persistent;
-	zend_ulong	default_port;
-	char			*default_host;
-	char			*default_user;
-	char			*default_socket;
-	char			*default_pw;
+	zend_ulong			default_port;
+	char				*default_host;
+	char				*default_user;
+	char				*default_pw;
+	char				*default_socket;
 	zend_long			reconnect;
 	zend_long			allow_local_infile;
-	zend_long			strict;
+	char				*local_infile_directory;
 	zend_long			error_no;
-	char			*error_msg;
+	char				*error_msg;
 	zend_long			report_mode;
-	HashTable		*report_ht;
-	zend_ulong	multi_query;
-	zend_bool 		rollback_on_cached_plink;
+	bool 				rollback_on_cached_plink;
 ZEND_END_MODULE_GLOBALS(mysqli)
 
 #define MyG(v) ZEND_MODULE_GLOBALS_ACCESSOR(mysqli, v)