From: "Bart Schaefer" <schaefer@candle.brasslantern.com>
To: zsh-workers@sunsite.dk
Subject: Re: PATCH: Re: Build Failures on SunOS-4.1 and 5.5
Date: Thu, 12 Apr 2001 16:20:36 +0000 [thread overview]
Message-ID: <1010412162037.ZM32221@candle.brasslantern.com> (raw)
In-Reply-To: <1010412155741.ZM31500@candle.brasslantern.com>
On Apr 12, 3:57pm, Bart Schaefer wrote:
} Subject: Re: PATCH: Re: Build Failures on SunOS-4.1 and 5.5
}
} [...] it's probably better to (1) change system.h to conditionally
} include <term.h> (only when not HAVE_TERMCAP_H) and (2) make the entire
} block in prototypes.h be wrapped in
}
} #if !(defined(HAVE_TERMCAP_H) || defined(HAVE_TERM_H))
Ignoring my patch in 13962, which was the right fix for my local variant
of Vin's symptoms but not for the actual bug report, here's the complete
change:
Index: Src/prototypes.h
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/prototypes.h,v
retrieving revision 1.2
diff -u -r1.2 prototypes.h
--- Src/prototypes.h 2001/04/12 14:56:15 1.2
+++ Src/prototypes.h 2001/04/12 16:16:00
@@ -33,15 +33,13 @@
char *calloc _((size_t, size_t));
#endif
-#ifndef HAVE_TERMCAP_H
+#if !(defined(HAVE_TERMCAP_H) || defined(HAVE_TERM_H))
extern int tgetent _((char *bp, char *name));
extern int tgetnum _((char *id));
extern int tgetflag _((char *id));
extern char *tgetstr _((char *id, char **area));
extern char *tgoto _((char *cm, int destcol, int destline));
-# ifndef HAVE_TERM_H
extern int tputs _((char *cp, int affcnt, int (*outc) (int)));
-# endif
#endif
/* MISSING PROTOTYPES FOR VARIOUS OPERATING SYSTEMS */
Index: Src/system.h
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/system.h,v
retrieving revision 1.12
diff -u -r1.12 system.h
--- Src/system.h 2001/02/19 10:26:54 1.12
+++ Src/system.h 2001/04/12 16:16:04
@@ -312,6 +312,10 @@
#ifdef HAVE_TERMCAP_H
# include <termcap.h>
+#else
+# ifdef HAVE_TERM_H
+# include <term.h>
+# endif
#endif
#if defined(GWINSZ_IN_SYS_IOCTL) || defined(CLOBBERS_TYPEAHEAD)
Index: Src/Modules/terminfo.c
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/Modules/terminfo.c,v
retrieving revision 1.12
diff -u -r1.12 terminfo.c
--- Src/Modules/terminfo.c 2001/04/12 04:08:37 1.12
+++ Src/Modules/terminfo.c 2001/04/12 16:16:10
@@ -29,17 +29,14 @@
#include "terminfo.mdh"
#include "terminfo.pro"
-#ifdef HAVE_CURSES_H
-# include <curses.h>
-#endif
-#ifdef HAVE_TERM_H
-# include <term.h>
-#endif
static char terminfo_nam[] = "terminfo";
/**/
#ifdef HAVE_TIGETSTR
+# ifdef HAVE_CURSES_H
+# include <curses.h>
+# endif
static Param terminfo_pm;
--
Bart Schaefer Brass Lantern Enterprises
http://www.well.com/user/barts http://www.brasslantern.com
Zsh: http://www.zsh.org | PHPerl Project: http://phperl.sourceforge.net
next prev parent reply other threads:[~2001-04-12 16:21 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2001-04-12 14:33 Vin Shelton
2001-04-12 14:54 ` PATCH: " Clint Adams
2001-04-12 15:39 ` Bart Schaefer
2001-04-12 15:57 ` Bart Schaefer
2001-04-12 16:20 ` Bart Schaefer [this message]
2001-04-12 22:29 ` Wayne Davison
2001-04-12 23:08 ` Bart Schaefer
2001-04-13 1:13 ` Wayne Davison
2001-04-13 3:51 ` Bart Schaefer
2001-04-13 8:00 ` Wayne Davison
2001-04-13 16:42 ` Bart Schaefer
2001-04-13 16:49 ` Wayne Davison
2001-04-12 15:28 ` Bart Schaefer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1010412162037.ZM32221@candle.brasslantern.com \
--to=schaefer@candle.brasslantern.com \
--cc=zsh-workers@sunsite.dk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).