aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorGisle Vanem <gvanem@broadpark.no>2008-12-16 08:25:55 +0000
committerGisle Vanem <gvanem@broadpark.no>2008-12-16 08:25:55 +0000
commit418683f5377d7bcb751888345ba14a77fd68cdbd (patch)
treec7b7a137fbfc4745c21d4ba91dfaf4e0559d7ccc /lib
parent008b848dccafc18df79e0de9163b0bfab4f5392c (diff)
Added the use of Watt-32 tcp/ip stack for Win32 targets.
Diffstat (limited to 'lib')
-rw-r--r--lib/config-win32.h24
-rw-r--r--lib/connect.c4
-rw-r--r--lib/ftp.c2
3 files changed, 24 insertions, 6 deletions
diff --git a/lib/config-win32.h b/lib/config-win32.h
index dc359d6a3..eab2874cd 100644
--- a/lib/config-win32.h
+++ b/lib/config-win32.h
@@ -344,6 +344,30 @@
#define HAVE_STRUCT_TIMEVAL 1
/* ---------------------------------------------------------------- */
+/* Watt-32 tcp/ip SPECIFIC */
+/* ---------------------------------------------------------------- */
+
+#ifdef USE_WATT32
+ #include <tcp.h>
+ #undef byte
+ #undef word
+ #undef USE_WINSOCK
+ #undef HAVE_WINSOCK_H
+ #undef HAVE_WINSOCK2_H
+ #undef HAVE_WS2TCPIP_H
+ #define HAVE_GETADDRINFO
+ #define HAVE_GETNAMEINFO
+ #define HAVE_SYS_IOCTL_H
+ #define HAVE_SYS_SOCKET_H
+ #define HAVE_NETINET_IN_H
+ #define HAVE_NETDB_H
+ #define HAVE_ARPA_INET_H
+ #define HAVE_FREEADDRINFO
+ #define SOCKET int
+#endif
+
+
+/* ---------------------------------------------------------------- */
/* COMPILER SPECIFIC */
/* ---------------------------------------------------------------- */
diff --git a/lib/connect.c b/lib/connect.c
index 30cd1535b..569142d3e 100644
--- a/lib/connect.c
+++ b/lib/connect.c
@@ -23,8 +23,6 @@
#include "setup.h"
-#ifndef WIN32
-/* headers for non-win32 */
#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
#endif
@@ -71,8 +69,6 @@
#include <inet.h>
#endif
-#endif /* !WIN32 */
-
#include <stdio.h>
#include <errno.h>
#include <string.h>
diff --git a/lib/ftp.c b/lib/ftp.c
index 7f17cc111..4b0c536cd 100644
--- a/lib/ftp.c
+++ b/lib/ftp.c
@@ -34,7 +34,6 @@
#include <unistd.h>
#endif
-#ifndef WIN32
#ifdef HAVE_SYS_SOCKET_H
#include <sys/socket.h>
#endif
@@ -54,7 +53,6 @@
#include <in.h>
#include <inet.h>
#endif
-#endif /* !WIN32 */
#if (defined(NETWARE) && defined(__NOVELL_LIBC__))
#undef in_addr_t