From: Bart Schaefer <schaefer@zanshin.com>
To: zsh-workers@sunsite.dk
Subject: PATCH Re: Problem compiling tcp module
Date: Thu, 07 Jun 2001 13:42:49 -0700 [thread overview]
Message-ID: <E1586cD-0003h7-00@aztec.zanshin.com> (raw)
Also a change to comptest so that "make check" works under emacs.
Index: Src/Modules/tcp.h
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/Modules/tcp.h,v
retrieving revision 1.1
diff -u -r1.1 tcp.h
--- Src/Modules/tcp.h 2001/06/06 18:53:56 1.1
+++ Src/Modules/tcp.h 2001/06/07 20:39:59
@@ -27,10 +27,33 @@
*
*/
+/*
+ * 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 can include netinet/in_systm.h, which
+ * doesn't exist on cygwin.
+ */
#include "../../config.h"
+
#include <sys/types.h>
#include <sys/socket.h>
#include <netdb.h>
+
+/*
+ * For some reason, configure doesn't always detect netinet/in_systm.h.
+ * On some systems, including linux, this seems to be because gcc is
+ * throwing up a warning message about the redefinition of
+ * __USE_LARGEFILE. This means the problem is somewhere in the
+ * header files where we can't get at it. For now, revert to
+ * not including this file only on systems where we know it's missing.
+ * Currently this is just cygwin.
+ */
+#ifndef __CYGWIN__
+# include <netinet/in_systm.h>
+#endif
+#include <netinet/in.h>
+#include <netinet/ip.h>
+#include <arpa/inet.h>
/* Is IPv6 supported by the library? */
Index: Src/Modules/zftp.c
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/Modules/zftp.c,v
retrieving revision 1.13
diff -u -r1.13 zftp.c
--- Src/Modules/zftp.c 2001/06/06 18:53:56 1.13
+++ Src/Modules/zftp.c 2001/06/07 20:39:59
@@ -49,33 +49,6 @@
struct zftp_session;
typedef struct zftp_session *Zftp_session;
-/*
- * 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 can include netinet/in_systm.h, which
- * doesn't exist on cygwin.
- */
-#include "../../config.h"
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netdb.h>
-/*
- * For some reason, configure doesn't always detect netinet/in_systm.h.
- * On some systems, including linux, this seems to be because gcc is
- * throwing up a warning message about the redefinition of
- * __USE_LARGEFILE. This means the problem is somewhere in the
- * header files where we can't get at it. For now, revert to
- * not including this file only on systems where we know it's missing.
- * Currently this is just cygwin.
- */
-#ifndef __CYGWIN__
-# include <netinet/in_systm.h>
-#endif
-#include <netinet/in.h>
-#include <netinet/ip.h>
-#include <arpa/inet.h>
-
#include "tcp.h"
#include "zftp.mdh"
#include "zftp.pro"
Index: Test/comptest
===================================================================
RCS file: /cvsroot/zsh/zsh/Test/comptest,v
retrieving revision 1.13
diff -u -r1.13 comptest
--- Test/comptest 2001/05/08 10:26:58 1.13
+++ Test/comptest 2001/06/07 20:39:59
@@ -8,7 +8,7 @@
zmodload -i zsh/zpty
comptest_zsh=${ZSH:-zsh}
- termcap_ce="$(echotc ce)"
+ termcap_ce="$(echotc ce 2>/dev/null)"
while getopts z: opt; do
case $opt in
@@ -30,6 +30,7 @@
"module_path=( $module_path )" \
"fpath=( $fpath )" \
'LISTMAX=10000000
+TERM=vt100
stty columns 80 rows 24
setopt zle
bindkey -e
reply other threads:[~2001-06-07 20:42 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=E1586cD-0003h7-00@aztec.zanshin.com \
--to=schaefer@zanshin.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).