HPM Hooks Update

Signed-off-by: HerculesWSAPI <Hercules@efficiently.awesome>

1 files changed, 190 insertions, 190 deletions

diff --git a/src/plugins/HPMHooking/HPMHooking_char.Hooks.inc b/src/plugins/HPMHooking/HPMHooking_char.Hooks.inc
index 4dcc5dffb..b06abebb7 100644
--- a/src/plugins/HPMHooking/HPMHooking_char.Hooks.inc
+++ b/src/plugins/HPMHooking/HPMHooking_char.Hooks.inc
@@ -159,12 +159,12 @@ int HP_chr_delete_char_sql(int char_id) {
 	}
 	return retVal___;
 }
-DBData HP_chr_create_online_char_data(DBKey key, va_list args) {
+struct DBData HP_chr_create_online_char_data(union DBKey key, va_list args) {
 	int hIndex = 0;
-	DBData retVal___;
-	memset(&retVal___, '\0', sizeof(DBData));
+	struct DBData retVal___;
+	memset(&retVal___, '\0', sizeof(struct DBData));
 	if( HPMHooks.count.HP_chr_create_online_char_data_pre ) {
-		DBData (*preHookFunc) (DBKey *key, va_list args);
+		struct DBData (*preHookFunc) (union DBKey *key, va_list args);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_create_online_char_data_pre; hIndex++ ) {
 			va_list args___copy; va_copy(args___copy, args);
@@ -183,7 +183,7 @@ DBData HP_chr_create_online_char_data(DBKey key, va_list args) {
 		va_end(args___copy);
 	}
 	if( HPMHooks.count.HP_chr_create_online_char_data_post ) {
-		DBData (*postHookFunc) (DBData retVal___, DBKey *key, va_list args);
+		struct DBData (*postHookFunc) (struct DBData retVal___, union DBKey *key, va_list args);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_create_online_char_data_post; hIndex++ ) {
 			va_list args___copy; va_copy(args___copy, args);
 			postHookFunc = HPMHooks.list.HP_chr_create_online_char_data_post[hIndex].func;
@@ -323,11 +323,11 @@ void HP_chr_set_char_offline(int char_id, int account_id) {
 	}
 	return;
 }
-int HP_chr_db_setoffline(DBKey key, DBData *data, va_list ap) {
+int HP_chr_db_setoffline(union DBKey key, struct DBData *data, va_list ap) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_chr_db_setoffline_pre ) {
-		int (*preHookFunc) (DBKey *key, DBData *data, va_list ap);
+		int (*preHookFunc) (union DBKey *key, struct DBData *data, va_list ap);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_db_setoffline_pre; hIndex++ ) {
 			va_list ap___copy; va_copy(ap___copy, ap);
@@ -346,7 +346,7 @@ int HP_chr_db_setoffline(DBKey key, DBData *data, va_list ap) {
 		va_end(ap___copy);
 	}
 	if( HPMHooks.count.HP_chr_db_setoffline_post ) {
-		int (*postHookFunc) (int retVal___, DBKey *key, DBData *data, va_list ap);
+		int (*postHookFunc) (int retVal___, union DBKey *key, struct DBData *data, va_list ap);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_db_setoffline_post; hIndex++ ) {
 			va_list ap___copy; va_copy(ap___copy, ap);
 			postHookFunc = HPMHooks.list.HP_chr_db_setoffline_post[hIndex].func;
@@ -356,11 +356,11 @@ int HP_chr_db_setoffline(DBKey key, DBData *data, va_list ap) {
 	}
 	return retVal___;
 }
-int HP_chr_db_kickoffline(DBKey key, DBData *data, va_list ap) {
+int HP_chr_db_kickoffline(union DBKey key, struct DBData *data, va_list ap) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_chr_db_kickoffline_pre ) {
-		int (*preHookFunc) (DBKey *key, DBData *data, va_list ap);
+		int (*preHookFunc) (union DBKey *key, struct DBData *data, va_list ap);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_db_kickoffline_pre; hIndex++ ) {
 			va_list ap___copy; va_copy(ap___copy, ap);
@@ -379,7 +379,7 @@ int HP_chr_db_kickoffline(DBKey key, DBData *data, va_list ap) {
 		va_end(ap___copy);
 	}
 	if( HPMHooks.count.HP_chr_db_kickoffline_post ) {
-		int (*postHookFunc) (int retVal___, DBKey *key, DBData *data, va_list ap);
+		int (*postHookFunc) (int retVal___, union DBKey *key, struct DBData *data, va_list ap);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_db_kickoffline_post; hIndex++ ) {
 			va_list ap___copy; va_copy(ap___copy, ap);
 			postHookFunc = HPMHooks.list.HP_chr_db_kickoffline_post[hIndex].func;
@@ -467,12 +467,12 @@ void HP_chr_set_all_offline_sql(void) {
 	}
 	return;
 }
-DBData HP_chr_create_charstatus(DBKey key, va_list args) {
+struct DBData HP_chr_create_charstatus(union DBKey key, va_list args) {
 	int hIndex = 0;
-	DBData retVal___;
-	memset(&retVal___, '\0', sizeof(DBData));
+	struct DBData retVal___;
+	memset(&retVal___, '\0', sizeof(struct DBData));
 	if( HPMHooks.count.HP_chr_create_charstatus_pre ) {
-		DBData (*preHookFunc) (DBKey *key, va_list args);
+		struct DBData (*preHookFunc) (union DBKey *key, va_list args);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_create_charstatus_pre; hIndex++ ) {
 			va_list args___copy; va_copy(args___copy, args);
@@ -491,7 +491,7 @@ DBData HP_chr_create_charstatus(DBKey key, va_list args) {
 		va_end(args___copy);
 	}
 	if( HPMHooks.count.HP_chr_create_charstatus_post ) {
-		DBData (*postHookFunc) (DBData retVal___, DBKey *key, va_list args);
+		struct DBData (*postHookFunc) (struct DBData retVal___, union DBKey *key, va_list args);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_create_charstatus_post; hIndex++ ) {
 			va_list args___copy; va_copy(args___copy, args);
 			postHookFunc = HPMHooks.list.HP_chr_create_charstatus_post[hIndex].func;
@@ -4069,11 +4069,11 @@ int HP_chr_broadcast_user_count(int tid, int64 tick, int id, intptr_t data) {
 	}
 	return retVal___;
 }
-int HP_chr_send_accounts_tologin_sub(DBKey key, DBData *data, va_list ap) {
+int HP_chr_send_accounts_tologin_sub(union DBKey key, struct DBData *data, va_list ap) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_chr_send_accounts_tologin_sub_pre ) {
-		int (*preHookFunc) (DBKey *key, DBData *data, va_list ap);
+		int (*preHookFunc) (union DBKey *key, struct DBData *data, va_list ap);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_send_accounts_tologin_sub_pre; hIndex++ ) {
 			va_list ap___copy; va_copy(ap___copy, ap);
@@ -4092,7 +4092,7 @@ int HP_chr_send_accounts_tologin_sub(DBKey key, DBData *data, va_list ap) {
 		va_end(ap___copy);
 	}
 	if( HPMHooks.count.HP_chr_send_accounts_tologin_sub_post ) {
-		int (*postHookFunc) (int retVal___, DBKey *key, DBData *data, va_list ap);
+		int (*postHookFunc) (int retVal___, union DBKey *key, struct DBData *data, va_list ap);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_send_accounts_tologin_sub_post; hIndex++ ) {
 			va_list ap___copy; va_copy(ap___copy, ap);
 			postHookFunc = HPMHooks.list.HP_chr_send_accounts_tologin_sub_post[hIndex].func;
@@ -4156,11 +4156,11 @@ int HP_chr_check_connect_login_server(int tid, int64 tick, int id, intptr_t data
 	}
 	return retVal___;
 }
-int HP_chr_online_data_cleanup_sub(DBKey key, DBData *data, va_list ap) {
+int HP_chr_online_data_cleanup_sub(union DBKey key, struct DBData *data, va_list ap) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_chr_online_data_cleanup_sub_pre ) {
-		int (*preHookFunc) (DBKey *key, DBData *data, va_list ap);
+		int (*preHookFunc) (union DBKey *key, struct DBData *data, va_list ap);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_online_data_cleanup_sub_pre; hIndex++ ) {
 			va_list ap___copy; va_copy(ap___copy, ap);
@@ -4179,7 +4179,7 @@ int HP_chr_online_data_cleanup_sub(DBKey key, DBData *data, va_list ap) {
 		va_end(ap___copy);
 	}
 	if( HPMHooks.count.HP_chr_online_data_cleanup_sub_post ) {
-		int (*postHookFunc) (int retVal___, DBKey *key, DBData *data, va_list ap);
+		int (*postHookFunc) (int retVal___, union DBKey *key, struct DBData *data, va_list ap);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_online_data_cleanup_sub_post; hIndex++ ) {
 			va_list ap___copy; va_copy(ap___copy, ap);
 			postHookFunc = HPMHooks.list.HP_chr_online_data_cleanup_sub_post[hIndex].func;
@@ -4589,11 +4589,11 @@ void HP_core_shutdown_callback(void) {
 	return;
 }
 /* DB */
-DBOptions HP_DB_fix_options(DBType type, DBOptions options) {
+enum DBOptions HP_DB_fix_options(enum DBType type, enum DBOptions options) {
 	int hIndex = 0;
-	DBOptions retVal___ = DB_OPT_BASE;
+	enum DBOptions retVal___ = DB_OPT_BASE;
 	if( HPMHooks.count.HP_DB_fix_options_pre ) {
-		DBOptions (*preHookFunc) (DBType *type, DBOptions *options);
+		enum DBOptions (*preHookFunc) (enum DBType *type, enum DBOptions *options);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_fix_options_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_DB_fix_options_pre[hIndex].func;
@@ -4608,7 +4608,7 @@ DBOptions HP_DB_fix_options(DBType type, DBOptions options) {
 		retVal___ = HPMHooks.source.DB.fix_options(type, options);
 	}
 	if( HPMHooks.count.HP_DB_fix_options_post ) {
-		DBOptions (*postHookFunc) (DBOptions retVal___, DBType *type, DBOptions *options);
+		enum DBOptions (*postHookFunc) (enum DBOptions retVal___, enum DBType *type, enum DBOptions *options);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_fix_options_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_DB_fix_options_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, &type, &options);
@@ -4616,11 +4616,11 @@ DBOptions HP_DB_fix_options(DBType type, DBOptions options) {
 	}
 	return retVal___;
 }
-DBComparator HP_DB_default_cmp(DBType type) {
+DBComparator HP_DB_default_cmp(enum DBType type) {
 	int hIndex = 0;
 	DBComparator retVal___ = NULL;
 	if( HPMHooks.count.HP_DB_default_cmp_pre ) {
-		DBComparator (*preHookFunc) (DBType *type);
+		DBComparator (*preHookFunc) (enum DBType *type);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_default_cmp_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_DB_default_cmp_pre[hIndex].func;
@@ -4635,7 +4635,7 @@ DBComparator HP_DB_default_cmp(DBType type) {
 		retVal___ = HPMHooks.source.DB.default_cmp(type);
 	}
 	if( HPMHooks.count.HP_DB_default_cmp_post ) {
-		DBComparator (*postHookFunc) (DBComparator retVal___, DBType *type);
+		DBComparator (*postHookFunc) (DBComparator retVal___, enum DBType *type);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_default_cmp_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_DB_default_cmp_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, &type);
@@ -4643,11 +4643,11 @@ DBComparator HP_DB_default_cmp(DBType type) {
 	}
 	return retVal___;
 }
-DBHasher HP_DB_default_hash(DBType type) {
+DBHasher HP_DB_default_hash(enum DBType type) {
 	int hIndex = 0;
 	DBHasher retVal___ = NULL;
 	if( HPMHooks.count.HP_DB_default_hash_pre ) {
-		DBHasher (*preHookFunc) (DBType *type);
+		DBHasher (*preHookFunc) (enum DBType *type);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_default_hash_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_DB_default_hash_pre[hIndex].func;
@@ -4662,7 +4662,7 @@ DBHasher HP_DB_default_hash(DBType type) {
 		retVal___ = HPMHooks.source.DB.default_hash(type);
 	}
 	if( HPMHooks.count.HP_DB_default_hash_post ) {
-		DBHasher (*postHookFunc) (DBHasher retVal___, DBType *type);
+		DBHasher (*postHookFunc) (DBHasher retVal___, enum DBType *type);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_default_hash_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_DB_default_hash_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, &type);
@@ -4670,11 +4670,11 @@ DBHasher HP_DB_default_hash(DBType type) {
 	}
 	return retVal___;
 }
-DBReleaser HP_DB_default_release(DBType type, DBOptions options) {
+DBReleaser HP_DB_default_release(enum DBType type, enum DBOptions options) {
 	int hIndex = 0;
 	DBReleaser retVal___ = NULL;
 	if( HPMHooks.count.HP_DB_default_release_pre ) {
-		DBReleaser (*preHookFunc) (DBType *type, DBOptions *options);
+		DBReleaser (*preHookFunc) (enum DBType *type, enum DBOptions *options);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_default_release_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_DB_default_release_pre[hIndex].func;
@@ -4689,7 +4689,7 @@ DBReleaser HP_DB_default_release(DBType type, DBOptions options) {
 		retVal___ = HPMHooks.source.DB.default_release(type, options);
 	}
 	if( HPMHooks.count.HP_DB_default_release_post ) {
-		DBReleaser (*postHookFunc) (DBReleaser retVal___, DBType *type, DBOptions *options);
+		DBReleaser (*postHookFunc) (DBReleaser retVal___, enum DBType *type, enum DBOptions *options);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_default_release_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_DB_default_release_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, &type, &options);
@@ -4697,11 +4697,11 @@ DBReleaser HP_DB_default_release(DBType type, DBOptions options) {
 	}
 	return retVal___;
 }
-DBReleaser HP_DB_custom_release(DBRelease which) {
+DBReleaser HP_DB_custom_release(enum DBReleaseOption which) {
 	int hIndex = 0;
 	DBReleaser retVal___ = NULL;
 	if( HPMHooks.count.HP_DB_custom_release_pre ) {
-		DBReleaser (*preHookFunc) (DBRelease *which);
+		DBReleaser (*preHookFunc) (enum DBReleaseOption *which);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_custom_release_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_DB_custom_release_pre[hIndex].func;
@@ -4716,7 +4716,7 @@ DBReleaser HP_DB_custom_release(DBRelease which) {
 		retVal___ = HPMHooks.source.DB.custom_release(which);
 	}
 	if( HPMHooks.count.HP_DB_custom_release_post ) {
-		DBReleaser (*postHookFunc) (DBReleaser retVal___, DBRelease *which);
+		DBReleaser (*postHookFunc) (DBReleaser retVal___, enum DBReleaseOption *which);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_custom_release_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_DB_custom_release_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, &which);
@@ -4724,11 +4724,11 @@ DBReleaser HP_DB_custom_release(DBRelease which) {
 	}
 	return retVal___;
 }
-DBMap* HP_DB_alloc(const char *file, const char *func, int line, DBType type, DBOptions options, unsigned short maxlen) {
+struct DBMap* HP_DB_alloc(const char *file, const char *func, int line, enum DBType type, enum DBOptions options, unsigned short maxlen) {
 	int hIndex = 0;
-	DBMap* retVal___ = NULL;
+	struct DBMap* retVal___ = NULL;
 	if( HPMHooks.count.HP_DB_alloc_pre ) {
-		DBMap* (*preHookFunc) (const char *file, const char *func, int *line, DBType *type, DBOptions *options, unsigned short *maxlen);
+		struct DBMap* (*preHookFunc) (const char *file, const char *func, int *line, enum DBType *type, enum DBOptions *options, unsigned short *maxlen);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_alloc_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_DB_alloc_pre[hIndex].func;
@@ -4743,7 +4743,7 @@ DBMap* HP_DB_alloc(const char *file, const char *func, int line, DBType type, DB
 		retVal___ = HPMHooks.source.DB.alloc(file, func, line, type, options, maxlen);
 	}
 	if( HPMHooks.count.HP_DB_alloc_post ) {
-		DBMap* (*postHookFunc) (DBMap* retVal___, const char *file, const char *func, int *line, DBType *type, DBOptions *options, unsigned short *maxlen);
+		struct DBMap* (*postHookFunc) (struct DBMap* retVal___, const char *file, const char *func, int *line, enum DBType *type, enum DBOptions *options, unsigned short *maxlen);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_alloc_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_DB_alloc_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, file, func, &line, &type, &options, &maxlen);
@@ -4751,12 +4751,12 @@ DBMap* HP_DB_alloc(const char *file, const char *func, int line, DBType type, DB
 	}
 	return retVal___;
 }
-DBKey HP_DB_i2key(int key) {
+union DBKey HP_DB_i2key(int key) {
 	int hIndex = 0;
-	DBKey retVal___;
-	memset(&retVal___, '\0', sizeof(DBKey));
+	union DBKey retVal___;
+	memset(&retVal___, '\0', sizeof(union DBKey));
 	if( HPMHooks.count.HP_DB_i2key_pre ) {
-		DBKey (*preHookFunc) (int *key);
+		union DBKey (*preHookFunc) (int *key);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_i2key_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_DB_i2key_pre[hIndex].func;
@@ -4771,7 +4771,7 @@ DBKey HP_DB_i2key(int key) {
 		retVal___ = HPMHooks.source.DB.i2key(key);
 	}
 	if( HPMHooks.count.HP_DB_i2key_post ) {
-		DBKey (*postHookFunc) (DBKey retVal___, int *key);
+		union DBKey (*postHookFunc) (union DBKey retVal___, int *key);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_i2key_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_DB_i2key_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, &key);
@@ -4779,12 +4779,12 @@ DBKey HP_DB_i2key(int key) {
 	}
 	return retVal___;
 }
-DBKey HP_DB_ui2key(unsigned int key) {
+union DBKey HP_DB_ui2key(unsigned int key) {
 	int hIndex = 0;
-	DBKey retVal___;
-	memset(&retVal___, '\0', sizeof(DBKey));
+	union DBKey retVal___;
+	memset(&retVal___, '\0', sizeof(union DBKey));
 	if( HPMHooks.count.HP_DB_ui2key_pre ) {
-		DBKey (*preHookFunc) (unsigned int *key);
+		union DBKey (*preHookFunc) (unsigned int *key);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_ui2key_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_DB_ui2key_pre[hIndex].func;
@@ -4799,7 +4799,7 @@ DBKey HP_DB_ui2key(unsigned int key) {
 		retVal___ = HPMHooks.source.DB.ui2key(key);
 	}
 	if( HPMHooks.count.HP_DB_ui2key_post ) {
-		DBKey (*postHookFunc) (DBKey retVal___, unsigned int *key);
+		union DBKey (*postHookFunc) (union DBKey retVal___, unsigned int *key);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_ui2key_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_DB_ui2key_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, &key);
@@ -4807,12 +4807,12 @@ DBKey HP_DB_ui2key(unsigned int key) {
 	}
 	return retVal___;
 }
-DBKey HP_DB_str2key(const char *key) {
+union DBKey HP_DB_str2key(const char *key) {
 	int hIndex = 0;
-	DBKey retVal___;
-	memset(&retVal___, '\0', sizeof(DBKey));
+	union DBKey retVal___;
+	memset(&retVal___, '\0', sizeof(union DBKey));
 	if( HPMHooks.count.HP_DB_str2key_pre ) {
-		DBKey (*preHookFunc) (const char *key);
+		union DBKey (*preHookFunc) (const char *key);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_str2key_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_DB_str2key_pre[hIndex].func;
@@ -4827,7 +4827,7 @@ DBKey HP_DB_str2key(const char *key) {
 		retVal___ = HPMHooks.source.DB.str2key(key);
 	}
 	if( HPMHooks.count.HP_DB_str2key_post ) {
-		DBKey (*postHookFunc) (DBKey retVal___, const char *key);
+		union DBKey (*postHookFunc) (union DBKey retVal___, const char *key);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_str2key_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_DB_str2key_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, key);
@@ -4835,12 +4835,12 @@ DBKey HP_DB_str2key(const char *key) {
 	}
 	return retVal___;
 }
-DBKey HP_DB_i642key(int64 key) {
+union DBKey HP_DB_i642key(int64 key) {
 	int hIndex = 0;
-	DBKey retVal___;
-	memset(&retVal___, '\0', sizeof(DBKey));
+	union DBKey retVal___;
+	memset(&retVal___, '\0', sizeof(union DBKey));
 	if( HPMHooks.count.HP_DB_i642key_pre ) {
-		DBKey (*preHookFunc) (int64 *key);
+		union DBKey (*preHookFunc) (int64 *key);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_i642key_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_DB_i642key_pre[hIndex].func;
@@ -4855,7 +4855,7 @@ DBKey HP_DB_i642key(int64 key) {
 		retVal___ = HPMHooks.source.DB.i642key(key);
 	}
 	if( HPMHooks.count.HP_DB_i642key_post ) {
-		DBKey (*postHookFunc) (DBKey retVal___, int64 *key);
+		union DBKey (*postHookFunc) (union DBKey retVal___, int64 *key);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_i642key_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_DB_i642key_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, &key);
@@ -4863,12 +4863,12 @@ DBKey HP_DB_i642key(int64 key) {
 	}
 	return retVal___;
 }
-DBKey HP_DB_ui642key(uint64 key) {
+union DBKey HP_DB_ui642key(uint64 key) {
 	int hIndex = 0;
-	DBKey retVal___;
-	memset(&retVal___, '\0', sizeof(DBKey));
+	union DBKey retVal___;
+	memset(&retVal___, '\0', sizeof(union DBKey));
 	if( HPMHooks.count.HP_DB_ui642key_pre ) {
-		DBKey (*preHookFunc) (uint64 *key);
+		union DBKey (*preHookFunc) (uint64 *key);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_ui642key_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_DB_ui642key_pre[hIndex].func;
@@ -4883,7 +4883,7 @@ DBKey HP_DB_ui642key(uint64 key) {
 		retVal___ = HPMHooks.source.DB.ui642key(key);
 	}
 	if( HPMHooks.count.HP_DB_ui642key_post ) {
-		DBKey (*postHookFunc) (DBKey retVal___, uint64 *key);
+		union DBKey (*postHookFunc) (union DBKey retVal___, uint64 *key);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_ui642key_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_DB_ui642key_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, &key);
@@ -4891,12 +4891,12 @@ DBKey HP_DB_ui642key(uint64 key) {
 	}
 	return retVal___;
 }
-DBData HP_DB_i2data(int data) {
+struct DBData HP_DB_i2data(int data) {
 	int hIndex = 0;
-	DBData retVal___;
-	memset(&retVal___, '\0', sizeof(DBData));
+	struct DBData retVal___;
+	memset(&retVal___, '\0', sizeof(struct DBData));
 	if( HPMHooks.count.HP_DB_i2data_pre ) {
-		DBData (*preHookFunc) (int *data);
+		struct DBData (*preHookFunc) (int *data);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_i2data_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_DB_i2data_pre[hIndex].func;
@@ -4911,7 +4911,7 @@ DBData HP_DB_i2data(int data) {
 		retVal___ = HPMHooks.source.DB.i2data(data);
 	}
 	if( HPMHooks.count.HP_DB_i2data_post ) {
-		DBData (*postHookFunc) (DBData retVal___, int *data);
+		struct DBData (*postHookFunc) (struct DBData retVal___, int *data);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_i2data_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_DB_i2data_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, &data);
@@ -4919,12 +4919,12 @@ DBData HP_DB_i2data(int data) {
 	}
 	return retVal___;
 }
-DBData HP_DB_ui2data(unsigned int data) {
+struct DBData HP_DB_ui2data(unsigned int data) {
 	int hIndex = 0;
-	DBData retVal___;
-	memset(&retVal___, '\0', sizeof(DBData));
+	struct DBData retVal___;
+	memset(&retVal___, '\0', sizeof(struct DBData));
 	if( HPMHooks.count.HP_DB_ui2data_pre ) {
-		DBData (*preHookFunc) (unsigned int *data);
+		struct DBData (*preHookFunc) (unsigned int *data);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_ui2data_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_DB_ui2data_pre[hIndex].func;
@@ -4939,7 +4939,7 @@ DBData HP_DB_ui2data(unsigned int data) {
 		retVal___ = HPMHooks.source.DB.ui2data(data);
 	}
 	if( HPMHooks.count.HP_DB_ui2data_post ) {
-		DBData (*postHookFunc) (DBData retVal___, unsigned int *data);
+		struct DBData (*postHookFunc) (struct DBData retVal___, unsigned int *data);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_ui2data_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_DB_ui2data_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, &data);
@@ -4947,12 +4947,12 @@ DBData HP_DB_ui2data(unsigned int data) {
 	}
 	return retVal___;
 }
-DBData HP_DB_ptr2data(void *data) {
+struct DBData HP_DB_ptr2data(void *data) {
 	int hIndex = 0;
-	DBData retVal___;
-	memset(&retVal___, '\0', sizeof(DBData));
+	struct DBData retVal___;
+	memset(&retVal___, '\0', sizeof(struct DBData));
 	if( HPMHooks.count.HP_DB_ptr2data_pre ) {
-		DBData (*preHookFunc) (void *data);
+		struct DBData (*preHookFunc) (void *data);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_ptr2data_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_DB_ptr2data_pre[hIndex].func;
@@ -4967,7 +4967,7 @@ DBData HP_DB_ptr2data(void *data) {
 		retVal___ = HPMHooks.source.DB.ptr2data(data);
 	}
 	if( HPMHooks.count.HP_DB_ptr2data_post ) {
-		DBData (*postHookFunc) (DBData retVal___, void *data);
+		struct DBData (*postHookFunc) (struct DBData retVal___, void *data);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_ptr2data_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_DB_ptr2data_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, data);
@@ -4975,11 +4975,11 @@ DBData HP_DB_ptr2data(void *data) {
 	}
 	return retVal___;
 }
-int HP_DB_data2i(DBData *data) {
+int HP_DB_data2i(struct DBData *data) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_DB_data2i_pre ) {
-		int (*preHookFunc) (DBData *data);
+		int (*preHookFunc) (struct DBData *data);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_data2i_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_DB_data2i_pre[hIndex].func;
@@ -4994,7 +4994,7 @@ int HP_DB_data2i(DBData *data) {
 		retVal___ = HPMHooks.source.DB.data2i(data);
 	}
 	if( HPMHooks.count.HP_DB_data2i_post ) {
-		int (*postHookFunc) (int retVal___, DBData *data);
+		int (*postHookFunc) (int retVal___, struct DBData *data);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_data2i_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_DB_data2i_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, data);
@@ -5002,11 +5002,11 @@ int HP_DB_data2i(DBData *data) {
 	}
 	return retVal___;
 }
-unsigned int HP_DB_data2ui(DBData *data) {
+unsigned int HP_DB_data2ui(struct DBData *data) {
 	int hIndex = 0;
 	unsigned int retVal___ = 0;
 	if( HPMHooks.count.HP_DB_data2ui_pre ) {
-		unsigned int (*preHookFunc) (DBData *data);
+		unsigned int (*preHookFunc) (struct DBData *data);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_data2ui_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_DB_data2ui_pre[hIndex].func;
@@ -5021,7 +5021,7 @@ unsigned int HP_DB_data2ui(DBData *data) {
 		retVal___ = HPMHooks.source.DB.data2ui(data);
 	}
 	if( HPMHooks.count.HP_DB_data2ui_post ) {
-		unsigned int (*postHookFunc) (unsigned int retVal___, DBData *data);
+		unsigned int (*postHookFunc) (unsigned int retVal___, struct DBData *data);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_data2ui_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_DB_data2ui_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, data);
@@ -5029,11 +5029,11 @@ unsigned int HP_DB_data2ui(DBData *data) {
 	}
 	return retVal___;
 }
-void* HP_DB_data2ptr(DBData *data) {
+void* HP_DB_data2ptr(struct DBData *data) {
 	int hIndex = 0;
 	void* retVal___ = NULL;
 	if( HPMHooks.count.HP_DB_data2ptr_pre ) {
-		void* (*preHookFunc) (DBData *data);
+		void* (*preHookFunc) (struct DBData *data);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_data2ptr_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_DB_data2ptr_pre[hIndex].func;
@@ -5048,7 +5048,7 @@ void* HP_DB_data2ptr(DBData *data) {
 		retVal___ = HPMHooks.source.DB.data2ptr(data);
 	}
 	if( HPMHooks.count.HP_DB_data2ptr_post ) {
-		void* (*postHookFunc) (void* retVal___, DBData *data);
+		void* (*postHookFunc) (void* retVal___, struct DBData *data);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_DB_data2ptr_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_DB_data2ptr_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, data);
@@ -5779,11 +5779,11 @@ int HP_inter_guild_sql_init(void) {
 	}
 	return retVal___;
 }
-int HP_inter_guild_db_final(DBKey key, DBData *data, va_list ap) {
+int HP_inter_guild_db_final(union DBKey key, struct DBData *data, va_list ap) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_inter_guild_db_final_pre ) {
-		int (*preHookFunc) (DBKey *key, DBData *data, va_list ap);
+		int (*preHookFunc) (union DBKey *key, struct DBData *data, va_list ap);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_guild_db_final_pre; hIndex++ ) {
 			va_list ap___copy; va_copy(ap___copy, ap);
@@ -5802,7 +5802,7 @@ int HP_inter_guild_db_final(DBKey key, DBData *data, va_list ap) {
 		va_end(ap___copy);
 	}
 	if( HPMHooks.count.HP_inter_guild_db_final_post ) {
-		int (*postHookFunc) (int retVal___, DBKey *key, DBData *data, va_list ap);
+		int (*postHookFunc) (int retVal___, union DBKey *key, struct DBData *data, va_list ap);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_guild_db_final_post; hIndex++ ) {
 			va_list ap___copy; va_copy(ap___copy, ap);
 			postHookFunc = HPMHooks.list.HP_inter_guild_db_final_post[hIndex].func;
@@ -6496,11 +6496,11 @@ int HP_inter_mapif_init(int fd) {
 	}
 	return retVal___;
 }
-int HP_inter_check_ttl_wisdata_sub(DBKey key, DBData *data, va_list ap) {
+int HP_inter_check_ttl_wisdata_sub(union DBKey key, struct DBData *data, va_list ap) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_inter_check_ttl_wisdata_sub_pre ) {
-		int (*preHookFunc) (DBKey *key, DBData *data, va_list ap);
+		int (*preHookFunc) (union DBKey *key, struct DBData *data, va_list ap);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_check_ttl_wisdata_sub_pre; hIndex++ ) {
 			va_list ap___copy; va_copy(ap___copy, ap);
@@ -6519,7 +6519,7 @@ int HP_inter_check_ttl_wisdata_sub(DBKey key, DBData *data, va_list ap) {
 		va_end(ap___copy);
 	}
 	if( HPMHooks.count.HP_inter_check_ttl_wisdata_sub_post ) {
-		int (*postHookFunc) (int retVal___, DBKey *key, DBData *data, va_list ap);
+		int (*postHookFunc) (int retVal___, union DBKey *key, struct DBData *data, va_list ap);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_check_ttl_wisdata_sub_post; hIndex++ ) {
 			va_list ap___copy; va_copy(ap___copy, ap);
 			postHookFunc = HPMHooks.list.HP_inter_check_ttl_wisdata_sub_post[hIndex].func;
@@ -16225,11 +16225,11 @@ void HP_sockt_net_config_read(const char *filename) {
 	return;
 }
 /* SQL */
-int HP_SQL_Connect(Sql *self, const char *user, const char *passwd, const char *host, uint16 port, const char *db) {
+int HP_SQL_Connect(struct Sql *self, const char *user, const char *passwd, const char *host, uint16 port, const char *db) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_SQL_Connect_pre ) {
-		int (*preHookFunc) (Sql *self, const char *user, const char *passwd, const char *host, uint16 *port, const char *db);
+		int (*preHookFunc) (struct Sql *self, const char *user, const char *passwd, const char *host, uint16 *port, const char *db);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_Connect_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_SQL_Connect_pre[hIndex].func;
@@ -16244,7 +16244,7 @@ int HP_SQL_Connect(Sql *self, const char *user, const char *passwd, const char *
 		retVal___ = HPMHooks.source.SQL.Connect(self, user, passwd, host, port, db);
 	}
 	if( HPMHooks.count.HP_SQL_Connect_post ) {
-		int (*postHookFunc) (int retVal___, Sql *self, const char *user, const char *passwd, const char *host, uint16 *port, const char *db);
+		int (*postHookFunc) (int retVal___, struct Sql *self, const char *user, const char *passwd, const char *host, uint16 *port, const char *db);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_Connect_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_SQL_Connect_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, self, user, passwd, host, &port, db);
@@ -16252,11 +16252,11 @@ int HP_SQL_Connect(Sql *self, const char *user, const char *passwd, const char *
 	}
 	return retVal___;
 }
-int HP_SQL_GetTimeout(Sql *self, uint32 *out_timeout) {
+int HP_SQL_GetTimeout(struct Sql *self, uint32 *out_timeout) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_SQL_GetTimeout_pre ) {
-		int (*preHookFunc) (Sql *self, uint32 *out_timeout);
+		int (*preHookFunc) (struct Sql *self, uint32 *out_timeout);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_GetTimeout_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_SQL_GetTimeout_pre[hIndex].func;
@@ -16271,7 +16271,7 @@ int HP_SQL_GetTimeout(Sql *self, uint32 *out_timeout) {
 		retVal___ = HPMHooks.source.SQL.GetTimeout(self, out_timeout);
 	}
 	if( HPMHooks.count.HP_SQL_GetTimeout_post ) {
-		int (*postHookFunc) (int retVal___, Sql *self, uint32 *out_timeout);
+		int (*postHookFunc) (int retVal___, struct Sql *self, uint32 *out_timeout);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_GetTimeout_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_SQL_GetTimeout_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, self, out_timeout);
@@ -16279,11 +16279,11 @@ int HP_SQL_GetTimeout(Sql *self, uint32 *out_timeout) {
 	}
 	return retVal___;
 }
-int HP_SQL_GetColumnNames(Sql *self, const char *table, char *out_buf, size_t buf_len, char sep) {
+int HP_SQL_GetColumnNames(struct Sql *self, const char *table, char *out_buf, size_t buf_len, char sep) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_SQL_GetColumnNames_pre ) {
-		int (*preHookFunc) (Sql *self, const char *table, char *out_buf, size_t *buf_len, char *sep);
+		int (*preHookFunc) (struct Sql *self, const char *table, char *out_buf, size_t *buf_len, char *sep);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_GetColumnNames_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_SQL_GetColumnNames_pre[hIndex].func;
@@ -16298,7 +16298,7 @@ int HP_SQL_GetColumnNames(Sql *self, const char *table, char *out_buf, size_t bu
 		retVal___ = HPMHooks.source.SQL.GetColumnNames(self, table, out_buf, buf_len, sep);
 	}
 	if( HPMHooks.count.HP_SQL_GetColumnNames_post ) {
-		int (*postHookFunc) (int retVal___, Sql *self, const char *table, char *out_buf, size_t *buf_len, char *sep);
+		int (*postHookFunc) (int retVal___, struct Sql *self, const char *table, char *out_buf, size_t *buf_len, char *sep);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_GetColumnNames_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_SQL_GetColumnNames_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, self, table, out_buf, &buf_len, &sep);
@@ -16306,11 +16306,11 @@ int HP_SQL_GetColumnNames(Sql *self, const char *table, char *out_buf, size_t bu
 	}
 	return retVal___;
 }
-int HP_SQL_SetEncoding(Sql *self, const char *encoding) {
+int HP_SQL_SetEncoding(struct Sql *self, const char *encoding) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_SQL_SetEncoding_pre ) {
-		int (*preHookFunc) (Sql *self, const char *encoding);
+		int (*preHookFunc) (struct Sql *self, const char *encoding);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_SetEncoding_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_SQL_SetEncoding_pre[hIndex].func;
@@ -16325,7 +16325,7 @@ int HP_SQL_SetEncoding(Sql *self, const char *encoding) {
 		retVal___ = HPMHooks.source.SQL.SetEncoding(self, encoding);
 	}
 	if( HPMHooks.count.HP_SQL_SetEncoding_post ) {
-		int (*postHookFunc) (int retVal___, Sql *self, const char *encoding);
+		int (*postHookFunc) (int retVal___, struct Sql *self, const char *encoding);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_SetEncoding_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_SQL_SetEncoding_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, self, encoding);
@@ -16333,11 +16333,11 @@ int HP_SQL_SetEncoding(Sql *self, const char *encoding) {
 	}
 	return retVal___;
 }
-int HP_SQL_Ping(Sql *self) {
+int HP_SQL_Ping(struct Sql *self) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_SQL_Ping_pre ) {
-		int (*preHookFunc) (Sql *self);
+		int (*preHookFunc) (struct Sql *self);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_Ping_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_SQL_Ping_pre[hIndex].func;
@@ -16352,7 +16352,7 @@ int HP_SQL_Ping(Sql *self) {
 		retVal___ = HPMHooks.source.SQL.Ping(self);
 	}
 	if( HPMHooks.count.HP_SQL_Ping_post ) {
-		int (*postHookFunc) (int retVal___, Sql *self);
+		int (*postHookFunc) (int retVal___, struct Sql *self);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_Ping_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_SQL_Ping_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, self);
@@ -16360,11 +16360,11 @@ int HP_SQL_Ping(Sql *self) {
 	}
 	return retVal___;
 }
-size_t HP_SQL_EscapeString(Sql *self, char *out_to, const char *from) {
+size_t HP_SQL_EscapeString(struct Sql *self, char *out_to, const char *from) {
 	int hIndex = 0;
 	size_t retVal___ = 0;
 	if( HPMHooks.count.HP_SQL_EscapeString_pre ) {
-		size_t (*preHookFunc) (Sql *self, char *out_to, const char *from);
+		size_t (*preHookFunc) (struct Sql *self, char *out_to, const char *from);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_EscapeString_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_SQL_EscapeString_pre[hIndex].func;
@@ -16379,7 +16379,7 @@ size_t HP_SQL_EscapeString(Sql *self, char *out_to, const char *from) {
 		retVal___ = HPMHooks.source.SQL.EscapeString(self, out_to, from);
 	}
 	if( HPMHooks.count.HP_SQL_EscapeString_post ) {
-		size_t (*postHookFunc) (size_t retVal___, Sql *self, char *out_to, const char *from);
+		size_t (*postHookFunc) (size_t retVal___, struct Sql *self, char *out_to, const char *from);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_EscapeString_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_SQL_EscapeString_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, self, out_to, from);
@@ -16387,11 +16387,11 @@ size_t HP_SQL_EscapeString(Sql *self, char *out_to, const char *from) {
 	}
 	return retVal___;
 }
-size_t HP_SQL_EscapeStringLen(Sql *self, char *out_to, const char *from, size_t from_len) {
+size_t HP_SQL_EscapeStringLen(struct Sql *self, char *out_to, const char *from, size_t from_len) {
 	int hIndex = 0;
 	size_t retVal___ = 0;
 	if( HPMHooks.count.HP_SQL_EscapeStringLen_pre ) {
-		size_t (*preHookFunc) (Sql *self, char *out_to, const char *from, size_t *from_len);
+		size_t (*preHookFunc) (struct Sql *self, char *out_to, const char *from, size_t *from_len);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_EscapeStringLen_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_SQL_EscapeStringLen_pre[hIndex].func;
@@ -16406,7 +16406,7 @@ size_t HP_SQL_EscapeStringLen(Sql *self, char *out_to, const char *from, size_t
 		retVal___ = HPMHooks.source.SQL.EscapeStringLen(self, out_to, from, from_len);
 	}
 	if( HPMHooks.count.HP_SQL_EscapeStringLen_post ) {
-		size_t (*postHookFunc) (size_t retVal___, Sql *self, char *out_to, const char *from, size_t *from_len);
+		size_t (*postHookFunc) (size_t retVal___, struct Sql *self, char *out_to, const char *from, size_t *from_len);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_EscapeStringLen_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_SQL_EscapeStringLen_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, self, out_to, from, &from_len);
@@ -16414,11 +16414,11 @@ size_t HP_SQL_EscapeStringLen(Sql *self, char *out_to, const char *from, size_t
 	}
 	return retVal___;
 }
-int HP_SQL_QueryV(Sql *self, const char *query, va_list args) {
+int HP_SQL_QueryV(struct Sql *self, const char *query, va_list args) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_SQL_QueryV_pre ) {
-		int (*preHookFunc) (Sql *self, const char *query, va_list args);
+		int (*preHookFunc) (struct Sql *self, const char *query, va_list args);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_QueryV_pre; hIndex++ ) {
 			va_list args___copy; va_copy(args___copy, args);
@@ -16437,7 +16437,7 @@ int HP_SQL_QueryV(Sql *self, const char *query, va_list args) {
 		va_end(args___copy);
 	}
 	if( HPMHooks.count.HP_SQL_QueryV_post ) {
-		int (*postHookFunc) (int retVal___, Sql *self, const char *query, va_list args);
+		int (*postHookFunc) (int retVal___, struct Sql *self, const char *query, va_list args);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_QueryV_post; hIndex++ ) {
 			va_list args___copy; va_copy(args___copy, args);
 			postHookFunc = HPMHooks.list.HP_SQL_QueryV_post[hIndex].func;
@@ -16447,11 +16447,11 @@ int HP_SQL_QueryV(Sql *self, const char *query, va_list args) {
 	}
 	return retVal___;
 }
-int HP_SQL_QueryStr(Sql *self, const char *query) {
+int HP_SQL_QueryStr(struct Sql *self, const char *query) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_SQL_QueryStr_pre ) {
-		int (*preHookFunc) (Sql *self, const char *query);
+		int (*preHookFunc) (struct Sql *self, const char *query);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_QueryStr_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_SQL_QueryStr_pre[hIndex].func;
@@ -16466,7 +16466,7 @@ int HP_SQL_QueryStr(Sql *self, const char *query) {
 		retVal___ = HPMHooks.source.SQL.QueryStr(self, query);
 	}
 	if( HPMHooks.count.HP_SQL_QueryStr_post ) {
-		int (*postHookFunc) (int retVal___, Sql *self, const char *query);
+		int (*postHookFunc) (int retVal___, struct Sql *self, const char *query);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_QueryStr_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_SQL_QueryStr_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, self, query);
@@ -16474,11 +16474,11 @@ int HP_SQL_QueryStr(Sql *self, const char *query) {
 	}
 	return retVal___;
 }
-uint64 HP_SQL_LastInsertId(Sql *self) {
+uint64 HP_SQL_LastInsertId(struct Sql *self) {
 	int hIndex = 0;
 	uint64 retVal___ = 0;
 	if( HPMHooks.count.HP_SQL_LastInsertId_pre ) {
-		uint64 (*preHookFunc) (Sql *self);
+		uint64 (*preHookFunc) (struct Sql *self);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_LastInsertId_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_SQL_LastInsertId_pre[hIndex].func;
@@ -16493,7 +16493,7 @@ uint64 HP_SQL_LastInsertId(Sql *self) {
 		retVal___ = HPMHooks.source.SQL.LastInsertId(self);
 	}
 	if( HPMHooks.count.HP_SQL_LastInsertId_post ) {
-		uint64 (*postHookFunc) (uint64 retVal___, Sql *self);
+		uint64 (*postHookFunc) (uint64 retVal___, struct Sql *self);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_LastInsertId_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_SQL_LastInsertId_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, self);
@@ -16501,11 +16501,11 @@ uint64 HP_SQL_LastInsertId(Sql *self) {
 	}
 	return retVal___;
 }
-uint32 HP_SQL_NumColumns(Sql *self) {
+uint32 HP_SQL_NumColumns(struct Sql *self) {
 	int hIndex = 0;
 	uint32 retVal___ = 0;
 	if( HPMHooks.count.HP_SQL_NumColumns_pre ) {
-		uint32 (*preHookFunc) (Sql *self);
+		uint32 (*preHookFunc) (struct Sql *self);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_NumColumns_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_SQL_NumColumns_pre[hIndex].func;
@@ -16520,7 +16520,7 @@ uint32 HP_SQL_NumColumns(Sql *self) {
 		retVal___ = HPMHooks.source.SQL.NumColumns(self);
 	}
 	if( HPMHooks.count.HP_SQL_NumColumns_post ) {
-		uint32 (*postHookFunc) (uint32 retVal___, Sql *self);
+		uint32 (*postHookFunc) (uint32 retVal___, struct Sql *self);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_NumColumns_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_SQL_NumColumns_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, self);
@@ -16528,11 +16528,11 @@ uint32 HP_SQL_NumColumns(Sql *self) {
 	}
 	return retVal___;
 }
-uint64 HP_SQL_NumRows(Sql *self) {
+uint64 HP_SQL_NumRows(struct Sql *self) {
 	int hIndex = 0;
 	uint64 retVal___ = 0;
 	if( HPMHooks.count.HP_SQL_NumRows_pre ) {
-		uint64 (*preHookFunc) (Sql *self);
+		uint64 (*preHookFunc) (struct Sql *self);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_NumRows_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_SQL_NumRows_pre[hIndex].func;
@@ -16547,7 +16547,7 @@ uint64 HP_SQL_NumRows(Sql *self) {
 		retVal___ = HPMHooks.source.SQL.NumRows(self);
 	}
 	if( HPMHooks.count.HP_SQL_NumRows_post ) {
-		uint64 (*postHookFunc) (uint64 retVal___, Sql *self);
+		uint64 (*postHookFunc) (uint64 retVal___, struct Sql *self);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_NumRows_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_SQL_NumRows_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, self);
@@ -16555,11 +16555,11 @@ uint64 HP_SQL_NumRows(Sql *self) {
 	}
 	return retVal___;
 }
-int HP_SQL_NextRow(Sql *self) {
+int HP_SQL_NextRow(struct Sql *self) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_SQL_NextRow_pre ) {
-		int (*preHookFunc) (Sql *self);
+		int (*preHookFunc) (struct Sql *self);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_NextRow_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_SQL_NextRow_pre[hIndex].func;
@@ -16574,7 +16574,7 @@ int HP_SQL_NextRow(Sql *self) {
 		retVal___ = HPMHooks.source.SQL.NextRow(self);
 	}
 	if( HPMHooks.count.HP_SQL_NextRow_post ) {
-		int (*postHookFunc) (int retVal___, Sql *self);
+		int (*postHookFunc) (int retVal___, struct Sql *self);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_NextRow_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_SQL_NextRow_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, self);
@@ -16582,11 +16582,11 @@ int HP_SQL_NextRow(Sql *self) {
 	}
 	return retVal___;
 }
-int HP_SQL_GetData(Sql *self, size_t col, char **out_buf, size_t *out_len) {
+int HP_SQL_GetData(struct Sql *self, size_t col, char **out_buf, size_t *out_len) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_SQL_GetData_pre ) {
-		int (*preHookFunc) (Sql *self, size_t *col, char **out_buf, size_t *out_len);
+		int (*preHookFunc) (struct Sql *self, size_t *col, char **out_buf, size_t *out_len);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_GetData_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_SQL_GetData_pre[hIndex].func;
@@ -16601,7 +16601,7 @@ int HP_SQL_GetData(Sql *self, size_t col, char **out_buf, size_t *out_len) {
 		retVal___ = HPMHooks.source.SQL.GetData(self, col, out_buf, out_len);
 	}
 	if( HPMHooks.count.HP_SQL_GetData_post ) {
-		int (*postHookFunc) (int retVal___, Sql *self, size_t *col, char **out_buf, size_t *out_len);
+		int (*postHookFunc) (int retVal___, struct Sql *self, size_t *col, char **out_buf, size_t *out_len);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_GetData_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_SQL_GetData_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, self, &col, out_buf, out_len);
@@ -16609,10 +16609,10 @@ int HP_SQL_GetData(Sql *self, size_t col, char **out_buf, size_t *out_len) {
 	}
 	return retVal___;
 }
-void HP_SQL_FreeResult(Sql *self) {
+void HP_SQL_FreeResult(struct Sql *self) {
 	int hIndex = 0;
 	if( HPMHooks.count.HP_SQL_FreeResult_pre ) {
-		void (*preHookFunc) (Sql *self);
+		void (*preHookFunc) (struct Sql *self);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_FreeResult_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_SQL_FreeResult_pre[hIndex].func;
@@ -16627,7 +16627,7 @@ void HP_SQL_FreeResult(Sql *self) {
 		HPMHooks.source.SQL.FreeResult(self);
 	}
 	if( HPMHooks.count.HP_SQL_FreeResult_post ) {
-		void (*postHookFunc) (Sql *self);
+		void (*postHookFunc) (struct Sql *self);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_FreeResult_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_SQL_FreeResult_post[hIndex].func;
 			postHookFunc(self);
@@ -16635,10 +16635,10 @@ void HP_SQL_FreeResult(Sql *self) {
 	}
 	return;
 }
-void HP_SQL_ShowDebug_(Sql *self, const char *debug_file, const unsigned long debug_line) {
+void HP_SQL_ShowDebug_(struct Sql *self, const char *debug_file, const unsigned long debug_line) {
 	int hIndex = 0;
 	if( HPMHooks.count.HP_SQL_ShowDebug__pre ) {
-		void (*preHookFunc) (Sql *self, const char *debug_file, const unsigned long *debug_line);
+		void (*preHookFunc) (struct Sql *self, const char *debug_file, const unsigned long *debug_line);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_ShowDebug__pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_SQL_ShowDebug__pre[hIndex].func;
@@ -16653,7 +16653,7 @@ void HP_SQL_ShowDebug_(Sql *self, const char *debug_file, const unsigned long de
 		HPMHooks.source.SQL.ShowDebug_(self, debug_file, debug_line);
 	}
 	if( HPMHooks.count.HP_SQL_ShowDebug__post ) {
-		void (*postHookFunc) (Sql *self, const char *debug_file, const unsigned long *debug_line);
+		void (*postHookFunc) (struct Sql *self, const char *debug_file, const unsigned long *debug_line);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_ShowDebug__post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_SQL_ShowDebug__post[hIndex].func;
 			postHookFunc(self, debug_file, &debug_line);
@@ -16661,10 +16661,10 @@ void HP_SQL_ShowDebug_(Sql *self, const char *debug_file, const unsigned long de
 	}
 	return;
 }
-void HP_SQL_Free(Sql *self) {
+void HP_SQL_Free(struct Sql *self) {
 	int hIndex = 0;
 	if( HPMHooks.count.HP_SQL_Free_pre ) {
-		void (*preHookFunc) (Sql *self);
+		void (*preHookFunc) (struct Sql *self);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_Free_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_SQL_Free_pre[hIndex].func;
@@ -16679,7 +16679,7 @@ void HP_SQL_Free(Sql *self) {
 		HPMHooks.source.SQL.Free(self);
 	}
 	if( HPMHooks.count.HP_SQL_Free_post ) {
-		void (*postHookFunc) (Sql *self);
+		void (*postHookFunc) (struct Sql *self);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_Free_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_SQL_Free_post[hIndex].func;
 			postHookFunc(self);
@@ -16714,11 +16714,11 @@ struct Sql* HP_SQL_Malloc(void) {
 	}
 	return retVal___;
 }
-struct SqlStmt* HP_SQL_StmtMalloc(Sql *sql) {
+struct SqlStmt* HP_SQL_StmtMalloc(struct Sql *sql) {
 	int hIndex = 0;
 	struct SqlStmt* retVal___ = NULL;
 	if( HPMHooks.count.HP_SQL_StmtMalloc_pre ) {
-		struct SqlStmt* (*preHookFunc) (Sql *sql);
+		struct SqlStmt* (*preHookFunc) (struct Sql *sql);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtMalloc_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_SQL_StmtMalloc_pre[hIndex].func;
@@ -16733,7 +16733,7 @@ struct SqlStmt* HP_SQL_StmtMalloc(Sql *sql) {
 		retVal___ = HPMHooks.source.SQL.StmtMalloc(sql);
 	}
 	if( HPMHooks.count.HP_SQL_StmtMalloc_post ) {
-		struct SqlStmt* (*postHookFunc) (struct SqlStmt* retVal___, Sql *sql);
+		struct SqlStmt* (*postHookFunc) (struct SqlStmt* retVal___, struct Sql *sql);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtMalloc_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_SQL_StmtMalloc_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, sql);
@@ -16741,11 +16741,11 @@ struct SqlStmt* HP_SQL_StmtMalloc(Sql *sql) {
 	}
 	return retVal___;
 }
-int HP_SQL_StmtPrepareV(SqlStmt *self, const char *query, va_list args) {
+int HP_SQL_StmtPrepareV(struct SqlStmt *self, const char *query, va_list args) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_SQL_StmtPrepareV_pre ) {
-		int (*preHookFunc) (SqlStmt *self, const char *query, va_list args);
+		int (*preHookFunc) (struct SqlStmt *self, const char *query, va_list args);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtPrepareV_pre; hIndex++ ) {
 			va_list args___copy; va_copy(args___copy, args);
@@ -16764,7 +16764,7 @@ int HP_SQL_StmtPrepareV(SqlStmt *self, const char *query, va_list args) {
 		va_end(args___copy);
 	}
 	if( HPMHooks.count.HP_SQL_StmtPrepareV_post ) {
-		int (*postHookFunc) (int retVal___, SqlStmt *self, const char *query, va_list args);
+		int (*postHookFunc) (int retVal___, struct SqlStmt *self, const char *query, va_list args);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtPrepareV_post; hIndex++ ) {
 			va_list args___copy; va_copy(args___copy, args);
 			postHookFunc = HPMHooks.list.HP_SQL_StmtPrepareV_post[hIndex].func;
@@ -16774,11 +16774,11 @@ int HP_SQL_StmtPrepareV(SqlStmt *self, const char *query, va_list args) {
 	}
 	return retVal___;
 }
-int HP_SQL_StmtPrepareStr(SqlStmt *self, const char *query) {
+int HP_SQL_StmtPrepareStr(struct SqlStmt *self, const char *query) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_SQL_StmtPrepareStr_pre ) {
-		int (*preHookFunc) (SqlStmt *self, const char *query);
+		int (*preHookFunc) (struct SqlStmt *self, const char *query);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtPrepareStr_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_SQL_StmtPrepareStr_pre[hIndex].func;
@@ -16793,7 +16793,7 @@ int HP_SQL_StmtPrepareStr(SqlStmt *self, const char *query) {
 		retVal___ = HPMHooks.source.SQL.StmtPrepareStr(self, query);
 	}
 	if( HPMHooks.count.HP_SQL_StmtPrepareStr_post ) {
-		int (*postHookFunc) (int retVal___, SqlStmt *self, const char *query);
+		int (*postHookFunc) (int retVal___, struct SqlStmt *self, const char *query);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtPrepareStr_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_SQL_StmtPrepareStr_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, self, query);
@@ -16801,11 +16801,11 @@ int HP_SQL_StmtPrepareStr(SqlStmt *self, const char *query) {
 	}
 	return retVal___;
 }
-size_t HP_SQL_StmtNumParams(SqlStmt *self) {
+size_t HP_SQL_StmtNumParams(struct SqlStmt *self) {
 	int hIndex = 0;
 	size_t retVal___ = 0;
 	if( HPMHooks.count.HP_SQL_StmtNumParams_pre ) {
-		size_t (*preHookFunc) (SqlStmt *self);
+		size_t (*preHookFunc) (struct SqlStmt *self);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtNumParams_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_SQL_StmtNumParams_pre[hIndex].func;
@@ -16820,7 +16820,7 @@ size_t HP_SQL_StmtNumParams(SqlStmt *self) {
 		retVal___ = HPMHooks.source.SQL.StmtNumParams(self);
 	}
 	if( HPMHooks.count.HP_SQL_StmtNumParams_post ) {
-		size_t (*postHookFunc) (size_t retVal___, SqlStmt *self);
+		size_t (*postHookFunc) (size_t retVal___, struct SqlStmt *self);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtNumParams_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_SQL_StmtNumParams_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, self);
@@ -16828,11 +16828,11 @@ size_t HP_SQL_StmtNumParams(SqlStmt *self) {
 	}
 	return retVal___;
 }
-int HP_SQL_StmtBindParam(SqlStmt *self, size_t idx, SqlDataType buffer_type, void *buffer, size_t buffer_len) {
+int HP_SQL_StmtBindParam(struct SqlStmt *self, size_t idx, enum SqlDataType buffer_type, const void *buffer, size_t buffer_len) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_SQL_StmtBindParam_pre ) {
-		int (*preHookFunc) (SqlStmt *self, size_t *idx, SqlDataType *buffer_type, void *buffer, size_t *buffer_len);
+		int (*preHookFunc) (struct SqlStmt *self, size_t *idx, enum SqlDataType *buffer_type, const void *buffer, size_t *buffer_len);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtBindParam_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_SQL_StmtBindParam_pre[hIndex].func;
@@ -16847,7 +16847,7 @@ int HP_SQL_StmtBindParam(SqlStmt *self, size_t idx, SqlDataType buffer_type, voi
 		retVal___ = HPMHooks.source.SQL.StmtBindParam(self, idx, buffer_type, buffer, buffer_len);
 	}
 	if( HPMHooks.count.HP_SQL_StmtBindParam_post ) {
-		int (*postHookFunc) (int retVal___, SqlStmt *self, size_t *idx, SqlDataType *buffer_type, void *buffer, size_t *buffer_len);
+		int (*postHookFunc) (int retVal___, struct SqlStmt *self, size_t *idx, enum SqlDataType *buffer_type, const void *buffer, size_t *buffer_len);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtBindParam_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_SQL_StmtBindParam_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, self, &idx, &buffer_type, buffer, &buffer_len);
@@ -16855,11 +16855,11 @@ int HP_SQL_StmtBindParam(SqlStmt *self, size_t idx, SqlDataType buffer_type, voi
 	}
 	return retVal___;
 }
-int HP_SQL_StmtExecute(SqlStmt *self) {
+int HP_SQL_StmtExecute(struct SqlStmt *self) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_SQL_StmtExecute_pre ) {
-		int (*preHookFunc) (SqlStmt *self);
+		int (*preHookFunc) (struct SqlStmt *self);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtExecute_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_SQL_StmtExecute_pre[hIndex].func;
@@ -16874,7 +16874,7 @@ int HP_SQL_StmtExecute(SqlStmt *self) {
 		retVal___ = HPMHooks.source.SQL.StmtExecute(self);
 	}
 	if( HPMHooks.count.HP_SQL_StmtExecute_post ) {
-		int (*postHookFunc) (int retVal___, SqlStmt *self);
+		int (*postHookFunc) (int retVal___, struct SqlStmt *self);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtExecute_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_SQL_StmtExecute_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, self);
@@ -16882,11 +16882,11 @@ int HP_SQL_StmtExecute(SqlStmt *self) {
 	}
 	return retVal___;
 }
-uint64 HP_SQL_StmtLastInsertId(SqlStmt *self) {
+uint64 HP_SQL_StmtLastInsertId(struct SqlStmt *self) {
 	int hIndex = 0;
 	uint64 retVal___ = 0;
 	if( HPMHooks.count.HP_SQL_StmtLastInsertId_pre ) {
-		uint64 (*preHookFunc) (SqlStmt *self);
+		uint64 (*preHookFunc) (struct SqlStmt *self);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtLastInsertId_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_SQL_StmtLastInsertId_pre[hIndex].func;
@@ -16901,7 +16901,7 @@ uint64 HP_SQL_StmtLastInsertId(SqlStmt *self) {
 		retVal___ = HPMHooks.source.SQL.StmtLastInsertId(self);
 	}
 	if( HPMHooks.count.HP_SQL_StmtLastInsertId_post ) {
-		uint64 (*postHookFunc) (uint64 retVal___, SqlStmt *self);
+		uint64 (*postHookFunc) (uint64 retVal___, struct SqlStmt *self);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtLastInsertId_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_SQL_StmtLastInsertId_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, self);
@@ -16909,11 +16909,11 @@ uint64 HP_SQL_StmtLastInsertId(SqlStmt *self) {
 	}
 	return retVal___;
 }
-size_t HP_SQL_StmtNumColumns(SqlStmt *self) {
+size_t HP_SQL_StmtNumColumns(struct SqlStmt *self) {
 	int hIndex = 0;
 	size_t retVal___ = 0;
 	if( HPMHooks.count.HP_SQL_StmtNumColumns_pre ) {
-		size_t (*preHookFunc) (SqlStmt *self);
+		size_t (*preHookFunc) (struct SqlStmt *self);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtNumColumns_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_SQL_StmtNumColumns_pre[hIndex].func;
@@ -16928,7 +16928,7 @@ size_t HP_SQL_StmtNumColumns(SqlStmt *self) {
 		retVal___ = HPMHooks.source.SQL.StmtNumColumns(self);
 	}
 	if( HPMHooks.count.HP_SQL_StmtNumColumns_post ) {
-		size_t (*postHookFunc) (size_t retVal___, SqlStmt *self);
+		size_t (*postHookFunc) (size_t retVal___, struct SqlStmt *self);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtNumColumns_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_SQL_StmtNumColumns_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, self);
@@ -16936,11 +16936,11 @@ size_t HP_SQL_StmtNumColumns(SqlStmt *self) {
 	}
 	return retVal___;
 }
-int HP_SQL_StmtBindColumn(SqlStmt *self, size_t idx, SqlDataType buffer_type, void *buffer, size_t buffer_len, uint32 *out_length, int8 *out_is_null) {
+int HP_SQL_StmtBindColumn(struct SqlStmt *self, size_t idx, enum SqlDataType buffer_type, void *buffer, size_t buffer_len, uint32 *out_length, int8 *out_is_null) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_SQL_StmtBindColumn_pre ) {
-		int (*preHookFunc) (SqlStmt *self, size_t *idx, SqlDataType *buffer_type, void *buffer, size_t *buffer_len, uint32 *out_length, int8 *out_is_null);
+		int (*preHookFunc) (struct SqlStmt *self, size_t *idx, enum SqlDataType *buffer_type, void *buffer, size_t *buffer_len, uint32 *out_length, int8 *out_is_null);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtBindColumn_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_SQL_StmtBindColumn_pre[hIndex].func;
@@ -16955,7 +16955,7 @@ int HP_SQL_StmtBindColumn(SqlStmt *self, size_t idx, SqlDataType buffer_type, vo
 		retVal___ = HPMHooks.source.SQL.StmtBindColumn(self, idx, buffer_type, buffer, buffer_len, out_length, out_is_null);
 	}
 	if( HPMHooks.count.HP_SQL_StmtBindColumn_post ) {
-		int (*postHookFunc) (int retVal___, SqlStmt *self, size_t *idx, SqlDataType *buffer_type, void *buffer, size_t *buffer_len, uint32 *out_length, int8 *out_is_null);
+		int (*postHookFunc) (int retVal___, struct SqlStmt *self, size_t *idx, enum SqlDataType *buffer_type, void *buffer, size_t *buffer_len, uint32 *out_length, int8 *out_is_null);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtBindColumn_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_SQL_StmtBindColumn_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, self, &idx, &buffer_type, buffer, &buffer_len, out_length, out_is_null);
@@ -16963,11 +16963,11 @@ int HP_SQL_StmtBindColumn(SqlStmt *self, size_t idx, SqlDataType buffer_type, vo
 	}
 	return retVal___;
 }
-uint64 HP_SQL_StmtNumRows(SqlStmt *self) {
+uint64 HP_SQL_StmtNumRows(struct SqlStmt *self) {
 	int hIndex = 0;
 	uint64 retVal___ = 0;
 	if( HPMHooks.count.HP_SQL_StmtNumRows_pre ) {
-		uint64 (*preHookFunc) (SqlStmt *self);
+		uint64 (*preHookFunc) (struct SqlStmt *self);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtNumRows_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_SQL_StmtNumRows_pre[hIndex].func;
@@ -16982,7 +16982,7 @@ uint64 HP_SQL_StmtNumRows(SqlStmt *self) {
 		retVal___ = HPMHooks.source.SQL.StmtNumRows(self);
 	}
 	if( HPMHooks.count.HP_SQL_StmtNumRows_post ) {
-		uint64 (*postHookFunc) (uint64 retVal___, SqlStmt *self);
+		uint64 (*postHookFunc) (uint64 retVal___, struct SqlStmt *self);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtNumRows_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_SQL_StmtNumRows_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, self);
@@ -16990,11 +16990,11 @@ uint64 HP_SQL_StmtNumRows(SqlStmt *self) {
 	}
 	return retVal___;
 }
-int HP_SQL_StmtNextRow(SqlStmt *self) {
+int HP_SQL_StmtNextRow(struct SqlStmt *self) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_SQL_StmtNextRow_pre ) {
-		int (*preHookFunc) (SqlStmt *self);
+		int (*preHookFunc) (struct SqlStmt *self);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtNextRow_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_SQL_StmtNextRow_pre[hIndex].func;
@@ -17009,7 +17009,7 @@ int HP_SQL_StmtNextRow(SqlStmt *self) {
 		retVal___ = HPMHooks.source.SQL.StmtNextRow(self);
 	}
 	if( HPMHooks.count.HP_SQL_StmtNextRow_post ) {
-		int (*postHookFunc) (int retVal___, SqlStmt *self);
+		int (*postHookFunc) (int retVal___, struct SqlStmt *self);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtNextRow_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_SQL_StmtNextRow_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, self);
@@ -17017,10 +17017,10 @@ int HP_SQL_StmtNextRow(SqlStmt *self) {
 	}
 	return retVal___;
 }
-void HP_SQL_StmtFreeResult(SqlStmt *self) {
+void HP_SQL_StmtFreeResult(struct SqlStmt *self) {
 	int hIndex = 0;
 	if( HPMHooks.count.HP_SQL_StmtFreeResult_pre ) {
-		void (*preHookFunc) (SqlStmt *self);
+		void (*preHookFunc) (struct SqlStmt *self);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtFreeResult_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_SQL_StmtFreeResult_pre[hIndex].func;
@@ -17035,7 +17035,7 @@ void HP_SQL_StmtFreeResult(SqlStmt *self) {
 		HPMHooks.source.SQL.StmtFreeResult(self);
 	}
 	if( HPMHooks.count.HP_SQL_StmtFreeResult_post ) {
-		void (*postHookFunc) (SqlStmt *self);
+		void (*postHookFunc) (struct SqlStmt *self);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtFreeResult_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_SQL_StmtFreeResult_post[hIndex].func;
 			postHookFunc(self);
@@ -17043,10 +17043,10 @@ void HP_SQL_StmtFreeResult(SqlStmt *self) {
 	}
 	return;
 }
-void HP_SQL_StmtFree(SqlStmt *self) {
+void HP_SQL_StmtFree(struct SqlStmt *self) {
 	int hIndex = 0;
 	if( HPMHooks.count.HP_SQL_StmtFree_pre ) {
-		void (*preHookFunc) (SqlStmt *self);
+		void (*preHookFunc) (struct SqlStmt *self);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtFree_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_SQL_StmtFree_pre[hIndex].func;
@@ -17061,7 +17061,7 @@ void HP_SQL_StmtFree(SqlStmt *self) {
 		HPMHooks.source.SQL.StmtFree(self);
 	}
 	if( HPMHooks.count.HP_SQL_StmtFree_post ) {
-		void (*postHookFunc) (SqlStmt *self);
+		void (*postHookFunc) (struct SqlStmt *self);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtFree_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_SQL_StmtFree_post[hIndex].func;
 			postHookFunc(self);
@@ -17069,10 +17069,10 @@ void HP_SQL_StmtFree(SqlStmt *self) {
 	}
 	return;
 }
-void HP_SQL_StmtShowDebug_(SqlStmt *self, const char *debug_file, const unsigned long debug_line) {
+void HP_SQL_StmtShowDebug_(struct SqlStmt *self, const char *debug_file, const unsigned long debug_line) {
 	int hIndex = 0;
 	if( HPMHooks.count.HP_SQL_StmtShowDebug__pre ) {
-		void (*preHookFunc) (SqlStmt *self, const char *debug_file, const unsigned long *debug_line);
+		void (*preHookFunc) (struct SqlStmt *self, const char *debug_file, const unsigned long *debug_line);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtShowDebug__pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_SQL_StmtShowDebug__pre[hIndex].func;
@@ -17087,7 +17087,7 @@ void HP_SQL_StmtShowDebug_(SqlStmt *self, const char *debug_file, const unsigned
 		HPMHooks.source.SQL.StmtShowDebug_(self, debug_file, debug_line);
 	}
 	if( HPMHooks.count.HP_SQL_StmtShowDebug__post ) {
-		void (*postHookFunc) (SqlStmt *self, const char *debug_file, const unsigned long *debug_line);
+		void (*postHookFunc) (struct SqlStmt *self, const char *debug_file, const unsigned long *debug_line);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtShowDebug__post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_SQL_StmtShowDebug__post[hIndex].func;
 			postHookFunc(self, debug_file, &debug_line);