[SR-Dev] git:janakj/mysql: Eliminate conflicts with files imported from ser/ mysql modules.

Module: sip-router Branch: janakj/mysql Commit: 10617927e31bf83f764defd1db42b6a70372e34a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1061792… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Tue Feb 17 00:05:25 2009 +0100 Eliminate conflicts with files imported from ser/mysql modules. * Comment out MODULE_VERSION, this is already used in mysql_mod.c * Prefix the type name of kamailio module data structures with kam_, this is how they were renamed in the sip-router repository. * Rename the exports structure to kam_exports to avoid conflict with the exports structure defined in mysql_mod.c --- modules/db_mysql/km_db_mysql.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/modules/db_mysql/km_db_mysql.c b/modules/db_mysql/km_db_mysql.c index dd2907e..efa5d88 100644 --- a/modules/db_mysql/km_db_mysql.c +++ b/modules/db_mysql/km_db_mysql.c @@ -54,19 +54,18 @@ unsigned int db_mysql_auto_reconnect = 1; /* Default is enabled */ static int mysql_mod_init(void); -MODULE_VERSION +/* MODULE_VERSION */ int db_mysql_bind_api(db_func_t *dbb); /*! \brief * MySQL database module interface */ -static cmd_export_t cmds[] = { +static kam_cmd_export_t cmds[] = { {"db_bind_api", (cmd_function)db_mysql_bind_api, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0} }; - /*! \brief * Exported parameters */ @@ -77,8 +76,7 @@ static param_export_t params[] = { {0, 0, 0} }; - -struct module_exports exports = { +struct kam_module_exports kam_exports = { "db_mysql", DEFAULT_DLFLAGS, /* dlopen flags */ cmds,