klist.c: Under Windows, #include winsock.h instead of sys/socket.h and

	netdb.h

Makefile.in: Under Windows, link against wsock32.lib to get
	gethostbyaddr().

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@11161 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/clients/klist/ChangeLog b/src/clients/klist/ChangeLog
index b7120478f996065a0971fd120307af469fd9bd8c..ab75d77a14281a6b8dc98e48ae463505f2e6d324 100644 (file)
--- a/src/clients/klist/ChangeLog
+++ b/src/clients/klist/ChangeLog
@@ -1,3 +1,11 @@
+Mon Feb  8 22:11:50 1999  Theodore Y. Ts'o  <tytso@mit.edu>
+
+       * klist.c: Under Windows, #include winsock.h instead of
+               sys/socket.h and netdb.h
+
+       * Makefile.in: Under Windows, link against wsock32.lib to get
+               gethostbyaddr().
+
 1998-11-13  Theodore Ts'o  <tytso@rsts-11.mit.edu>
 
        * Makefile.in: Set the myfulldir and mydir variables (which are

diff --git a/src/clients/klist/Makefile.in b/src/clients/klist/Makefile.in
index e2414013d11ef353b6780caa7e6325af273afc09..904d25473c215b392f1f0c956945ccc0b7e5cba7 100644 (file)
--- a/src/clients/klist/Makefile.in
+++ b/src/clients/klist/Makefile.in
@@ -21,7 +21,7 @@ klist: klist.o $(KRB5_BASE_DEPLIBS)
 
 ##WIN32##all-windows:: klist.exe
 ##WIN32##klist.exe: klist.obj $(KLIB) $(CLIB)
-##WIN32##      link /nologo /out:$@ $**
+##WIN32##      link /nologo /out:$@ $** wsock32.lib
 
 
 clean-unix::

diff --git a/src/clients/klist/klist.c b/src/clients/klist/klist.c
index deb5f44bc27dc0f0b16e21eb8579ded9f759944a..5d79a52e47c231c4703ba97587b62fc0e200666f 100644 (file)
--- a/src/clients/klist/klist.c
+++ b/src/clients/klist/klist.c
@@ -30,8 +30,13 @@
 #include <string.h>
 #include <stdio.h>
 #include <time.h>
+
+#if (defined(_MSDOS) || defined(_WIN32))
+#include <winsock.h>
+#else
 #include <sys/socket.h>
 #include <netdb.h>
+#endif
 
 extern int optind;
 extern char *optarg;