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 /main/term.c | |
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 'main/term.c')
-rw-r--r-- | main/term.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/term.c b/main/term.c index 7240c80b1..a38399eda 100644 --- a/main/term.c +++ b/main/term.c @@ -72,7 +72,7 @@ static short convshort(char *s) return a + b * 256; } -int term_init(void) +int ast_term_init(void) { char *term = getenv("TERM"); char termfile[256] = ""; |