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 /include | |
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 'include')
-rw-r--r-- | include/asterisk.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asterisk.h b/include/asterisk.h index 9b18733b1..a2fee3e57 100644 --- a/include/asterisk.h +++ b/include/asterisk.h @@ -57,7 +57,7 @@ int init_logger(void); /*!< Provided by logger.c */ void close_logger(void); /*!< Provided by logger.c */ int reload_logger(int); /*!< Provided by logger.c */ int init_framer(void); /*!< Provided by frame.c */ -int term_init(void); /*!< Provided by term.c */ +int ast_term_init(void); /*!< Provided by term.c */ int astdb_init(void); /*!< Provided by db.c */ void ast_channels_init(void); /*!< Provided by channel.c */ void ast_builtins_init(void); /*!< Provided by cli.c */ |