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
This commit is contained in:
parent
20295c53ef
commit
cbc8d698a0
|
@ -2503,7 +2503,7 @@ typedef enum {
|
||||||
} switch_cache_db_handle_type_t;
|
} switch_cache_db_handle_type_t;
|
||||||
|
|
||||||
typedef union {
|
typedef union {
|
||||||
switch_core_db_handle_t *core_db_dbh;
|
switch_coredb_handle_t *core_db_dbh;
|
||||||
switch_odbc_handle_t *odbc_dbh;
|
switch_odbc_handle_t *odbc_dbh;
|
||||||
switch_database_interface_handle_t *database_interface_dbh;
|
switch_database_interface_handle_t *database_interface_dbh;
|
||||||
} switch_cache_db_native_handle_t;
|
} switch_cache_db_native_handle_t;
|
||||||
|
|
|
@ -52,7 +52,7 @@ SWITCH_BEGIN_EXTERN_C
|
||||||
*/
|
*/
|
||||||
typedef struct sqlite3 switch_core_db_t;
|
typedef struct sqlite3 switch_core_db_t;
|
||||||
|
|
||||||
struct switch_core_db_handle {
|
struct switch_coredb_handle {
|
||||||
switch_bool_t in_memory;
|
switch_bool_t in_memory;
|
||||||
switch_core_db_t *handle;
|
switch_core_db_t *handle;
|
||||||
};
|
};
|
||||||
|
|
|
@ -2318,7 +2318,7 @@ typedef struct switch_codec_implementation switch_codec_implementation_t;
|
||||||
typedef struct switch_buffer switch_buffer_t;
|
typedef struct switch_buffer switch_buffer_t;
|
||||||
typedef union switch_codec_settings switch_codec_settings_t;
|
typedef union switch_codec_settings switch_codec_settings_t;
|
||||||
typedef struct switch_codec_fmtp switch_codec_fmtp_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_odbc_handle switch_odbc_handle_t;
|
||||||
typedef struct switch_database_interface_handle switch_database_interface_handle_t;
|
typedef struct switch_database_interface_handle switch_database_interface_handle_t;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue