Merged revisions 13707 via svnmerge from
authorTilghman Lesher <tilghman@meg.abyt.es>
Tue, 21 Mar 2006 05:30:32 +0000 (05:30 +0000)
committerTilghman Lesher <tilghman@meg.abyt.es>
Tue, 21 Mar 2006 05:30:32 +0000 (05:30 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r13707 | tilghman | 2006-03-20 23:27:33 -0600 (Mon, 20 Mar 2006) | 2 lines

Do away with some warnings and fix some indentation

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@13708 65c4cc65-6c06-0410-ace0-fbb531ad65f3

editline/term.c

index 60b3024..fb627ca 100644 (file)
@@ -64,10 +64,16 @@ __RCSID("$NetBSD: term.c,v 1.35 2002/03/18 16:00:59 christos Exp $");
 #ifdef HAVE_NCURSES_H
 #include <ncurses.h>
 #endif
-/* Solaris's term.h does horrid things. */
-#if (defined(HAVE_TERM_H) && !defined(SUNOS))
-#include <term.h>
-#endif
+#if defined(HAVE_TERM_H)
+#include "term.h"
+/* Can not use /usr/include/term.h because of a lot of incompatibilities, so just define some prototypes */
+extern int tgetent(char *, const char *);
+extern int tgetflag(const char *);
+extern int tgetnum(const char *);
+extern char *tgetstr(const char *, char **);
+extern int tputs (const char *, int, int (*)(int));
+extern char *tgoto (const char *, int, int);
+#endif /* defined(HAVE_TERM_H) */
 #include <sys/types.h>
 #include <sys/ioctl.h>
 
@@ -1190,15 +1196,15 @@ term_bind_arrow(EditLine *el)
                if (p && *p) {
                        j = (unsigned char) *p;
                        /*
-                        * Assign the arrow keys only if:
-                        *
-                        * 1. They are multi-character arrow keys and the user
-                        *    has not re-assigned the leading character, or
-                        *    has re-assigned the leading character to be
-                        *        ED_SEQUENCE_LEAD_IN
-                        * 2. They are single arrow keys pointing to an
+                        * Assign the arrow keys only if:
+                        *
+                        * 1. They are multi-character arrow keys and the user
+                        *    has not re-assigned the leading character, or
+                        *    has re-assigned the leading character to be
+                        *        ED_SEQUENCE_LEAD_IN
+                        * 2. They are single arrow keys pointing to an
                         *    unassigned key.
-                        */
+                        */
                        if (arrow[i].type == XK_NOD)
                                key_clear(el, map, p);
                        else {