[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
w32 port, patch 1: <winsock2.h>
From: |
Lars J. Aas |
Subject: |
w32 port, patch 1: <winsock2.h> |
Date: |
Sat, 18 Nov 2000 17:57:55 +0100 |
User-agent: |
Mutt/1.2.5i |
Since the w32 port of Guile seems to work OK, I'm starting to send
in patches again. In ChangeLog style:
* iselect.c: remove unused include directive (unistd.h).
* inet_aton.c, iselect.c, net_db.c, socket.c: include
<winsock2.h> instead of BSD headers if available.
This patch is missing the configure.in test for setting up the
HAVE_WINSOCK2_H define and adding -lws2_32 library on the libguile
link line. This will come in a later patch.
[I removed #include <unistd.h> because it was never included anyways -
scmconfig.h must be included first for HAVE_UNISTD_H to be defined.]
Lars J
Index: libguile/inet_aton.c
===================================================================
RCS file: /cvs/guile/guile-core/libguile/inet_aton.c,v
retrieving revision 1.6
diff -u -r1.6 inet_aton.c
--- libguile/inet_aton.c 2000/06/12 21:24:29 1.6
+++ libguile/inet_aton.c 2000/11/18 16:46:11
@@ -40,9 +40,17 @@
#include <ctype.h>
+#include "libguile/scmconfig.h"
+
+#ifdef HAVE_SYS_PARAM_H
#include <sys/param.h>
+#endif
+#ifdef HAVE_WINSOCK2_H
+#include <winsock2.h>
+#else
#include <netinet/in.h>
#include <arpa/inet.h>
+#endif
#if 0
Index: libguile/iselect.c
===================================================================
RCS file: /cvs/guile/guile-core/libguile/iselect.c,v
retrieving revision 1.24
diff -u -r1.24 iselect.c
--- libguile/iselect.c 2000/11/17 16:25:04 1.24
+++ libguile/iselect.c 2000/11/18 16:46:11
@@ -43,14 +43,14 @@
#include <limits.h>
#include <string.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
#include "libguile/_scm.h"
#include "libguile/async.h"
#include "libguile/iselect.h"
+
+#ifdef HAVE_WINSOCK2_H
+#include <winsock2.h>
+#endif
#ifdef GUILE_ISELECT
Index: libguile/net_db.c
===================================================================
RCS file: /cvs/guile/guile-core/libguile/net_db.c,v
retrieving revision 1.49
diff -u -r1.49 net_db.c
--- libguile/net_db.c 2000/11/17 16:25:04 1.49
+++ libguile/net_db.c 2000/11/18 16:46:12
@@ -65,10 +65,14 @@
#endif
#include <sys/types.h>
+#ifdef HAVE_WINSOCK2_H
+#include <winsock2.h>
+#else
#include <sys/socket.h>
#include <netdb.h>
#include <netinet/in.h>
#include <arpa/inet.h>
+#endif
#if !defined (HAVE_H_ERRNO)
extern int h_errno;
Index: libguile/socket.c
===================================================================
RCS file: /cvs/guile/guile-core/libguile/socket.c,v
retrieving revision 1.57
diff -u -r1.57 socket.c
--- libguile/socket.c 2000/11/17 16:25:04 1.57
+++ libguile/socket.c 2000/11/18 16:46:13
@@ -63,6 +63,9 @@
#include <unistd.h>
#endif
#include <sys/types.h>
+#ifdef HAVE_WINSOCK2_H
+#include <winsock2.h>
+#else
#include <sys/socket.h>
#ifdef HAVE_UNIX_DOMAIN_SOCKETS
#include <sys/un.h>
@@ -70,6 +73,7 @@
#include <netinet/in.h>
#include <netdb.h>
#include <arpa/inet.h>
+#endif
- w32 port, patch 1: <winsock2.h>,
Lars J. Aas <=