From: Andrey Volk <andywolk@gmail.com>
Date: Wed, 18 Sep 2019 22:01:11 +0000 (+0400)
Subject: FS-11827: [Core] Fix regression in mod_managed due to the type name switch_core_db_ha... 
X-Git-Tag: v1.10.2^2~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cbc8d698a083808feae98789d25a1098a1d6aadc;p=thirdparty%2Ffreeswitch.git

FS-11827: [Core] Fix regression in mod_managed due to the type name switch_core_db_handle conflicting with the switch_core_db_handle macro
---

diff --git a/src/include/switch_core.h b/src/include/switch_core.h
index dbff45d46b..8255e13c85 100644
--- a/src/include/switch_core.h
+++ b/src/include/switch_core.h
@@ -2503,7 +2503,7 @@ typedef enum {
 } switch_cache_db_handle_type_t;
 
 typedef union {
-	switch_core_db_handle_t *core_db_dbh;
+	switch_coredb_handle_t *core_db_dbh;
 	switch_odbc_handle_t *odbc_dbh;
 	switch_database_interface_handle_t *database_interface_dbh;
 } switch_cache_db_native_handle_t;
diff --git a/src/include/switch_core_db.h b/src/include/switch_core_db.h
index ab8351b782..4fbdc5bc63 100644
--- a/src/include/switch_core_db.h
+++ b/src/include/switch_core_db.h
@@ -52,7 +52,7 @@ SWITCH_BEGIN_EXTERN_C
 */
 	typedef struct sqlite3 switch_core_db_t;
 
-struct switch_core_db_handle {
+struct switch_coredb_handle {
 	switch_bool_t in_memory;
 	switch_core_db_t *handle;
 };
diff --git a/src/include/switch_types.h b/src/include/switch_types.h
index 456b3c4c66..09fe09defc 100644
--- a/src/include/switch_types.h
+++ b/src/include/switch_types.h
@@ -2318,7 +2318,7 @@ typedef struct switch_codec_implementation switch_codec_implementation_t;
 typedef struct switch_buffer switch_buffer_t;
 typedef union  switch_codec_settings switch_codec_settings_t;
 typedef struct switch_codec_fmtp switch_codec_fmtp_t;
-typedef struct switch_core_db_handle switch_core_db_handle_t;
+typedef struct switch_coredb_handle switch_coredb_handle_t;
 typedef struct switch_odbc_handle switch_odbc_handle_t;
 typedef struct switch_database_interface_handle switch_database_interface_handle_t;