[asterisk-commits] trunk r13708 - in /trunk: ./ editline/term.c

[asterisk-commits at lists.digium.com]

Author: tilghman
Date: Mon Mar 20 23:30:32 2006
New Revision: 13708

URL: http://svn.digium.com/view/asterisk?rev=13708&view=rev
Log:
Merged revisions 13707 via svnmerge from 
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

........

Modified:
    trunk/   (props changed)
    trunk/editline/term.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Modified: trunk/editline/term.c
URL: http://svn.digium.com/view/asterisk/trunk/editline/term.c?rev=13708&r1=13707&r2=13708&view=diff
==============================================================================
--- trunk/editline/term.c (original)
+++ trunk/editline/term.c Mon Mar 20 23:30:32 2006
@@ -64,10 +64,16 @@
 #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 @@
 		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 {