[SR-Dev] git:janakj/postgres: Various changes to get rid of conflicts and make km_ files compile.

Module: sip-router Branch: janakj/postgres Commit: a7bac3b9ab8829dcb2cd933cf3302adaf8f81cfa URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a7bac3b… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Wed Feb 18 01:22:22 2009 +0100 Various changes to get rid of conflicts and make km_ files compile. List of changes: * Path to header files updated to point to lib/srdb1 * Comment out MODULE_VERSION (already used pg_mod.c) * cmd_export_t renamed to kam_cmd_export_t * exports structure renamed to kam_exports (exports symbol is already defined by pg_mod.c) * module_exports renamed to kam_module_exports * db_con_t renamed to db1_con_t * db_res_t renamed to db1_res_t * DB field types renamed to DB1_* --- modules/db_postgres/km_db_postgres.c | 10 +++--- modules/db_postgres/km_dbase.c | 42 +++++++++++++++--------------- modules/db_postgres/km_dbase.h | 34 ++++++++++++------------ modules/db_postgres/km_pg_con.h | 4 +- modules/db_postgres/km_res.c | 48 +++++++++++++++++----------------- modules/db_postgres/km_res.h | 10 +++--- modules/db_postgres/km_val.c | 16 +++++----- modules/db_postgres/km_val.h | 2 +- 8 files changed, 83 insertions(+), 83 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=a7b…