diff options
| author | Kevin P. Fleming <kpfleming@digium.com> | 2006-10-04 00:26:21 +0000 |
|---|---|---|
| committer | Kevin P. Fleming <kpfleming@digium.com> | 2006-10-04 00:26:21 +0000 |
| commit | 41eb95e0557780e77042b979ffc151532e866b6d (patch) | |
| tree | db50802df6ebd873ba2c249b4c9a094410bcea5a /main/asterisk.c | |
| parent | 7294ba38521f6af7746f76264919cb4739966792 (diff) | |
Merged revisions 44322 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r44322 | kpfleming | 2006-10-03 19:25:44 -0500 (Tue, 03 Oct 2006) | 3 lines
ensure that local include files are always used
avoid a duplicate function name (term_init())
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44323 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/asterisk.c')
| -rw-r--r-- | main/asterisk.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/asterisk.c b/main/asterisk.c index d86e66a5b..456370143 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -2577,7 +2577,7 @@ int main(int argc, char *argv[]) } #endif - term_init(); + ast_term_init(); printf(term_end()); fflush(stdout); |