[svn-commits] seanbright: branch 1.6.1 r252316 - in /branches/1.6.1: ./ cdr/

[SVN commits to the Digium repositories]

Author: seanbright
Date: Sun Mar 14 12:47:11 2010
New Revision: 252316

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

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/cdr/cdr_sqlite3_custom.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/cdr/cdr_sqlite3_custom.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/cdr/cdr_sqlite3_custom.c?view=diff&rev=252316&r1=252315&r2=252316
==============================================================================
--- branches/1.6.1/cdr/cdr_sqlite3_custom.c (original)
+++ branches/1.6.1/cdr/cdr_sqlite3_custom.c Sun Mar 14 12:47:11 2010
@@ -226,7 +226,7 @@
 		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 @@
 		}
 	}
 
-	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);