diff options
| author | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-03-14 17:48:54 +0000 |
|---|---|---|
| committer | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-03-14 17:48:54 +0000 |
| commit | 914f8aa612ada0dcdd3e343e60e73ec50610ccf9 (patch) | |
| tree | 8bf8fde743a4f1c1103a163fa5ea1334a626d095 /cdr | |
| parent | 7df7509784a43f0622af3b247060d7e8275b0e40 (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.6.2@252317 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'cdr')
| -rw-r--r-- | cdr/cdr_sqlite3_custom.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cdr/cdr_sqlite3_custom.c b/cdr/cdr_sqlite3_custom.c index a16648be5..b1d317c24 100644 --- a/cdr/cdr_sqlite3_custom.c +++ b/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); |