[svn-commits] seanbright: trunk r252314 - in /trunk: cdr/ cel/

[SVN commits to the Digium repositories]

Author: seanbright
Date: Sun Mar 14 12:43:46 2010
New Revision: 252314

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=252314
Log:
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

Modified:
    trunk/cdr/cdr_sqlite3_custom.c
    trunk/cel/cel_sqlite3_custom.c

Modified: trunk/cdr/cdr_sqlite3_custom.c
URL: http://svnview.digium.com/svn/asterisk/trunk/cdr/cdr_sqlite3_custom.c?view=diff&rev=252314&r1=252313&r2=252314
==============================================================================
--- trunk/cdr/cdr_sqlite3_custom.c (original)
+++ trunk/cdr/cdr_sqlite3_custom.c Sun Mar 14 12:43:46 2010
@@ -219,7 +219,7 @@
 	}
 }
 
-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 @@
 		}
 	}
 
-	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);

Modified: trunk/cel/cel_sqlite3_custom.c
URL: http://svnview.digium.com/svn/asterisk/trunk/cel/cel_sqlite3_custom.c?view=diff&rev=252314&r1=252313&r2=252314
==============================================================================
--- trunk/cel/cel_sqlite3_custom.c (original)
+++ trunk/cel/cel_sqlite3_custom.c Sun Mar 14 12:43:46 2010
@@ -226,7 +226,7 @@
 	}
 }
 
-static void sqlite3_log(const struct ast_event *event, void *userdata)
+static void write_cel(const struct ast_event *event, void *userdata)
 {
 	char *error = NULL;
 	char *sql = NULL;
@@ -336,7 +336,7 @@
 		}
 	}
 
-	event_sub = ast_event_subscribe(AST_EVENT_CEL, sqlite3_log, "CEL sqlite3 custom backend", NULL, AST_EVENT_IE_END);
+	event_sub = ast_event_subscribe(AST_EVENT_CEL, write_cel, "CEL sqlite3 custom backend", NULL, AST_EVENT_IE_END);
 	if (!event_sub) {
 		ast_log(LOG_ERROR, "Unable to register custom SQLite3 CEL handling\n");
 		free_config();