summaryrefslogtreecommitdiffstats
path: root/src/include
diff options
context:
space:
mode:
authorDanilo Almeida <dalmeida@mit.edu>2002-04-11 03:19:23 +0000
committerDanilo Almeida <dalmeida@mit.edu>2002-04-11 03:19:23 +0000
commite64ea993ff65fd2a7fd50448bf8c2c2915512ce9 (patch)
tree8775f90270c9c1d1c672f199e80b3575ebf95027 /src/include
parent117bdd833185111bb6681b990acc4cb639bbd921 (diff)
downloadkrb5-e64ea993ff65fd2a7fd50448bf8c2c2915512ce9.tar.gz
krb5-e64ea993ff65fd2a7fd50448bf8c2c2915512ce9.tar.xz
krb5-e64ea993ff65fd2a7fd50448bf8c2c2915512ce9.zip
* port-sockets.h: Use Winsock 2 headers for Win32.
* fake-addrinfo.h: Define HAVE_GETADDRINFO for Win32. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@14379 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/include')
-rw-r--r--src/include/ChangeLog5
-rw-r--r--src/include/fake-addrinfo.h7
-rw-r--r--src/include/port-sockets.h3
3 files changed, 13 insertions, 2 deletions
diff --git a/src/include/ChangeLog b/src/include/ChangeLog
index c8cbbfb8d..4c4f6a60c 100644
--- a/src/include/ChangeLog
+++ b/src/include/ChangeLog
@@ -1,3 +1,8 @@
+2002-04-10 Danilo Almeida <dalmeida@mit.edu>
+
+ * port-sockets.h: Use Winsock 2 headers for Win32.
+ * fake-addrinfo.h: Define HAVE_GETADDRINFO for Win32.
+
2002-04-05 Ken Raeburn <raeburn@mit.edu>
* krb5.hin (krb5_c_valid_enctype, krb5_c_valid_cksumtype,
diff --git a/src/include/fake-addrinfo.h b/src/include/fake-addrinfo.h
index b7d0adad4..3225fbcd5 100644
--- a/src/include/fake-addrinfo.h
+++ b/src/include/fake-addrinfo.h
@@ -94,6 +94,11 @@
/* # define WRAP_GETNAMEINFO */
#endif
+#ifdef _WIN32
+#define HAVE_GETADDRINFO
+#define HAVE_GETNAMEINFO
+#endif
+
#ifdef WRAP_GETADDRINFO
static int (*gaiptr) (const char *, const char *, const struct addrinfo *,
struct addrinfo **) = &getaddrinfo;
@@ -222,7 +227,7 @@ int getnameinfo (const struct sockaddr *addr, socklen_t len,
#if !defined (HAVE_GETADDRINFO)
-#define HAVE_FAKE_GETADDRINFO
+#define HAVE_FAKE_GETADDRINFO /* was not originally HAVE_GETADDRINFO */
#define HAVE_GETADDRINFO
#undef HAVE_GETNAMEINFO
#define HAVE_GETNAMEINFO
diff --git a/src/include/port-sockets.h b/src/include/port-sockets.h
index 3a398fddb..052b40270 100644
--- a/src/include/port-sockets.h
+++ b/src/include/port-sockets.h
@@ -2,7 +2,8 @@
#define _PORT_SOCKET_H
#if defined(_WIN32)
-#include <winsock.h>
+#include <winsock2.h>
+#include <ws2tcpip.h>
/* Some of our own infrastructure where the WinSock stuff was too hairy
to dump into a clean Unix program... */