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.2@252317 65c4cc65-6c06-0410-ace0-fbb531ad65f3

cdr/cdr_sqlite3_custom.c

@@ -220,7 +220,7 @@ static void free_config(int reload)
 	}
 }
 
-static int sqlite3_log(struct ast_cdr *cdr)
+static int write_cdr(struct ast_cdr *cdr)
 {
 	int res = 0;
 	char *error = NULL;
@@ -321,7 +321,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);