From: "Bart Schaefer" <schaefer@candle.brasslantern.com>
To: Wayne Davison <wayned@users.sourceforge.net>
Cc: <zsh-workers@sunsite.dk>
Subject: Re: PATCH: Re: Build Failures on SunOS-4.1 and 5.5
Date: Thu, 12 Apr 2001 23:08:34 +0000 [thread overview]
Message-ID: <1010412230835.ZM692@candle.brasslantern.com> (raw)
In-Reply-To: <Pine.LNX.4.30.0104121518110.32060-200000@phong.blorf.net>
On Apr 12, 3:29pm, Wayne Davison wrote:
} Subject: Re: PATCH: Re: Build Failures on SunOS-4.1 and 5.5
}
} So, I moved the include of curses.h into Sys/system.h, and had to put
} it before the inclusion of termios.h (or else the sgtty structure
} would not get completely defined). THEN, term.h defines several
} lower-case macros that interfere with variable names in zsh, so I had
} to undef "tab", "lines", and "columns". And if that weren't enough, I
} had to change the name of the "move" function pointer in files.c
Well, bleah.
The whole point of using <termcap.h> if available and the block in
prototypes.h if not was to avoid including <curses.h> at the top level
of zsh, exactly because of all those silly conflicts. If <term.h> is
not usable without <curses.h>, we were better off where we started.
So how about the following (also not yet committed); I'm not sure how
it flies with respect to your needing to put curses.h above termios.h,
but it should be equivalent to what Clint originally committed with
respect to Src/Modules/terminfo.c.
Index: Src/prototypes.h
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/prototypes.h,v
retrieving revision 1.3
diff -u -r1.3 prototypes.h
--- Src/prototypes.h 2001/04/12 17:11:40 1.3
+++ Src/prototypes.h 2001/04/12 23:04:19
@@ -33,7 +33,7 @@
char *calloc _((size_t, size_t));
#endif
-#if !(defined(HAVE_TERMCAP_H) || defined(HAVE_TERM_H))
+#if !(defined(USES_TERMCAP_H) || defined(USES_TERM_H))
extern int tgetent _((char *bp, char *name));
extern int tgetnum _((char *id));
extern int tgetflag _((char *id));
Index: Src/system.h
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/system.h,v
retrieving revision 1.13
diff -u -r1.13 system.h
--- Src/system.h 2001/04/12 17:11:39 1.13
+++ Src/system.h 2001/04/12 23:04:24
@@ -310,14 +310,6 @@
# endif /* HAVE_TERMIO_H */
#endif /* HAVE_TERMIOS_H */
-#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)
# include <sys/ioctl.h>
#endif
Index: Src/Modules/termcap.c
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/Modules/termcap.c,v
retrieving revision 1.3
diff -u -r1.3 termcap.c
--- Src/Modules/termcap.c 2001/04/09 15:58:55 1.3
+++ Src/Modules/termcap.c 2001/04/12 23:04:26
@@ -27,12 +27,16 @@
*
*/
+#define USES_TERMCAP_H 1
#include "termcap.mdh"
#include "termcap.pro"
/* echotc: output a termcap */
#ifdef HAVE_TGETENT
+# ifdef HAVE_TERMCAP_H
+# include <termcap.h>
+# endif
/**/
static int
Index: Src/Modules/terminfo.c
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/Modules/terminfo.c,v
retrieving revision 1.13
diff -u -r1.13 terminfo.c
--- Src/Modules/terminfo.c 2001/04/12 17:11:40 1.13
+++ Src/Modules/terminfo.c 2001/04/12 23:04:30
@@ -27,6 +27,7 @@
*
*/
+#define USES_TERM_H 1
#include "terminfo.mdh"
#include "terminfo.pro"
@@ -36,6 +37,9 @@
#ifdef HAVE_TIGETSTR
# ifdef HAVE_CURSES_H
# include <curses.h>
+# endif
+# ifdef HAVE_TERM_H
+# include <term.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 23:09 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
2001-04-12 22:29 ` Wayne Davison
2001-04-12 23:08 ` Bart Schaefer [this message]
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=1010412230835.ZM692@candle.brasslantern.com \
--to=schaefer@candle.brasslantern.com \
--cc=wayned@users.sourceforge.net \
--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).