about summary refs log tree commit diff
path: root/Src/Modules/zftp.c
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2000-05-26 09:47:27 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2000-05-26 09:47:27 +0000
commitad9c7348b59fe131ef2771e720e6ac1ca60874fc (patch)
tree986ee1a4db18f3502ed5fec2008524ec9ac0fcd2 /Src/Modules/zftp.c
parent972fe43f512346ef90d680be3d4dbb4bd5d773e5 (diff)
downloadzsh-ad9c7348b59fe131ef2771e720e6ac1ca60874fc.tar.gz
zsh-ad9c7348b59fe131ef2771e720e6ac1ca60874fc.tar.xz
zsh-ad9c7348b59fe131ef2771e720e6ac1ca60874fc.zip
11587: Felix Rosencrantz: Src/pattern.c: uninitialised variable
11590: various cygwin fixes
Diffstat (limited to 'Src/Modules/zftp.c')
-rw-r--r--Src/Modules/zftp.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/Src/Modules/zftp.c b/Src/Modules/zftp.c
index 1aa527953..33632fcda 100644
--- a/Src/Modules/zftp.c
+++ b/Src/Modules/zftp.c
@@ -50,10 +50,20 @@ union zftp_sockaddr;
 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>
-#include <netinet/in_systm.h>
+#ifdef HAVE_NETINET_IN_SYSTM_H
+# include <netinet/in_systm.h>
+#endif
 #include <netinet/in.h>
 #include <netinet/ip.h>
 #include <arpa/inet.h>