diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-10-04 00:26:21 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-10-04 00:26:21 +0000 |
| commit | cdae839f80c827934702a33d592a2137fb77f8aa (patch) | |
| tree | db50802df6ebd873ba2c249b4c9a094410bcea5a /include/asterisk.h | |
| parent | 38f062988659847550e63f87284d9d3045b91423 (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: http://svn.digium.com/svn/asterisk/trunk@44323 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include/asterisk.h')
| -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 */ |