From: Sean Bright <sean@malleable.com>
Date: Sun, 14 Mar 2010 17:47:11 +0000 (+0000)
Subject: Merged revisions 252314 via svnmerge from
X-Git-Tag: 1.6.1.19-rc1~47
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=22d6cc5ad3476321dea1edde0d3c3f799b60aebf;p=thirdparty%2Fasterisk.git

Merged revisions 252314 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r252314 | seanbright | 2010-03-14 13:43:46 -0400 (Sun, 14 Mar 2010) | 8 lines

  Fix building CDR and CEL SQLite3 modules.

  They added a sqlite3_log() function which was conflicting with our function
  names.

  (closes issue #17017)
  Reported by: alephlg
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@252316 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/cdr/cdr_sqlite3_custom.c b/cdr/cdr_sqlite3_custom.c
index eee9c99dd7..981a2533e4 100644
--- a/cdr/cdr_sqlite3_custom.c
+++ b/cdr/cdr_sqlite3_custom.c
@@ -226,7 +226,7 @@ static void free_config(int reload)
 		ast_free(value);
 }
 
-static int sqlite3_log(struct ast_cdr *cdr)
+static int write_cdr(struct ast_cdr *cdr)
 {
 	int res = 0;
 	char *error = NULL;
@@ -329,7 +329,7 @@ static int load_module(void)
 		}
 	}
 
-	res = ast_cdr_register(name, desc, sqlite3_log);
+	res = ast_cdr_register(name, desc, write_cdr);
 	if (res) {
 		ast_log(LOG_ERROR, "Unable to register custom SQLite3 CDR handling\n");
 		free_config(0);