diff options
| author | Georgi Kodinov <joro@sun.com> | 2009-02-10 20:22:34 +0200 |
|---|---|---|
| committer | Georgi Kodinov <joro@sun.com> | 2009-02-10 20:22:34 +0200 |
| commit | f1f5d7d754c1e9b52fac38164aa62c380001aeb8 (patch) | |
| tree | e9e290c0a5e70a0b241b58451938efccbaa41dbc | |
| parent | 6520a8a18c9d02f094f76d5aa19cabb535c7dab6 (diff) | |
| parent | de7665acf854996213743cd98658a95fff280a53 (diff) | |
| download | mariadb-git-f1f5d7d754c1e9b52fac38164aa62c380001aeb8.tar.gz | |
merged 5.0-bugteam to 5.1-bugteam
| -rw-r--r-- | cmd-line-utils/libedit/Makefile.am | 2 | ||||
| -rw-r--r-- | cmd-line-utils/libedit/term.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/cmd-line-utils/libedit/Makefile.am b/cmd-line-utils/libedit/Makefile.am index 5a01a746963..ddafa4aab44 100644 --- a/cmd-line-utils/libedit/Makefile.am +++ b/cmd-line-utils/libedit/Makefile.am @@ -21,7 +21,7 @@ pkginclude_HEADERS = readline/readline.h noinst_HEADERS = chared.h el.h el_term.h histedit.h key.h parse.h refresh.h sig.h \ sys.h config.h hist.h map.h prompt.h read.h \ - search.h tty.h filecomplete.h + search.h tty.h filecomplete.h np/vis.h EXTRA_DIST = makelist.sh diff --git a/cmd-line-utils/libedit/term.c b/cmd-line-utils/libedit/term.c index 7a9d0250114..488c760da14 100644 --- a/cmd-line-utils/libedit/term.c +++ b/cmd-line-utils/libedit/term.c @@ -50,9 +50,11 @@ static char sccsid[] = "@(#)term.c 8.2 (Berkeley) 4/30/95"; #include <string.h> #include <stdlib.h> #include <unistd.h> +#if 0 /* TODO: do we need this */ #ifdef HAVE_TERMCAP_H #include <termcap.h> #endif +#endif #ifdef HAVE_CURSES_H #include <curses.h> #endif |