diff options
| author | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-03-14 17:45:53 +0000 |
|---|---|---|
| committer | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-03-14 17:45:53 +0000 |
| commit | 999be788f8079fb5c5148f64238e27a6018ec184 (patch) | |
| tree | e252913b1da61477365e8661ed34ecd334f9c011 | |
| parent | dbd6755ef3b03d27fa787ef8b3236b821fee9fdb (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.0@252315 f38db490-d61c-443f-a65b-d21fe96a405b
| -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 c16cdd560..7d917218d 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); |