diff options
Diffstat (limited to 'shells/zsh/patches/patch-ba')
-rw-r--r-- | shells/zsh/patches/patch-ba | 54 |
1 files changed, 14 insertions, 40 deletions
diff --git a/shells/zsh/patches/patch-ba b/shells/zsh/patches/patch-ba index 7a670e53d3d..0c604ada442 100644 --- a/shells/zsh/patches/patch-ba +++ b/shells/zsh/patches/patch-ba @@ -1,41 +1,11 @@ -$NetBSD: patch-ba,v 1.2 2010/02/23 17:11:01 roy Exp $ +$NetBSD: patch-ba,v 1.3 2010/03/10 08:19:57 roy Exp $ -termcap does not require curses. - ---- Src/Modules/termcap.c.orig 2010-02-07 08:52:07.000000000 +0000 -+++ Src/Modules/termcap.c 2010-02-07 08:54:03.000000000 +0000 -@@ -27,22 +27,10 @@ - * - */ - --/* -- * We need to include the zsh headers later to avoid clashes with -- * the definitions on some systems, however we need the configuration -- * file to decide whether we should avoid curses.h, which clashes -- * with several zsh constants on some systems (e.g. SunOS 4). -- */ - #include "../../config.h" - - #ifdef HAVE_TGETENT --# if defined(HAVE_CURSES_H) && defined(HAVE_TERM_H) --# define USES_TERM_H 1 --# else --# ifdef HAVE_TERMCAP_H --# define USES_TERMCAP_H 1 --# endif --# endif -+# define USES_TERMCAP_H 1 - #endif - - #include "termcap.mdh" -@@ -51,19 +39,7 @@ - static char termcap_nam[] = "termcap"; - - #ifdef HAVE_TGETENT --# ifdef USES_TERM_H --# ifdef HAVE_TERMIO_H --# include <termio.h> --# endif +--- Src/Modules/termcap.c.orig 2010-03-10 07:58:25.000000000 +0000 ++++ Src/Modules/termcap.c 2010-03-10 07:58:35.000000000 +0000 +@@ -55,14 +55,12 @@ + # ifdef HAVE_TERMIO_H + # include <termio.h> + # endif -# ifdef TERM_H_NEEDS_CURSES_H -# include <curses.h> -# endif @@ -44,8 +14,12 @@ termcap does not require curses. -# ifdef USES_TERMCAP_H -# include <termcap.h> -# endif --# endif -+# include <termcap.h> ++# endif ++# ifdef TERM_H_NEEDS_CURSES_H ++# include <curses.h> ++# endif ++# ifdef HAVE_TERMCAP_H ++# include <termcap.h> + # endif static Param termcap_pm; - |