diff options
| author | Theodore Tso <tytso@mit.edu> | 1999-02-09 03:12:52 +0000 |
|---|---|---|
| committer | Theodore Tso <tytso@mit.edu> | 1999-02-09 03:12:52 +0000 |
| commit | b59daa8ad9f7d9b3fd7c4ce485f4b20c474e1170 (patch) | |
| tree | be93dbf85bff6dc0388d2f164f4ece1316aaba37 /src | |
| parent | 6d75089a301e573403d08f85ff711c3d3b80d6ba (diff) | |
| download | krb5-b59daa8ad9f7d9b3fd7c4ce485f4b20c474e1170.tar.gz krb5-b59daa8ad9f7d9b3fd7c4ce485f4b20c474e1170.tar.xz krb5-b59daa8ad9f7d9b3fd7c4ce485f4b20c474e1170.zip | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/clients/klist/ChangeLog | 8 | ||||
| -rw-r--r-- | src/clients/klist/Makefile.in | 2 | ||||
| -rw-r--r-- | src/clients/klist/klist.c | 5 |
3 files changed, 14 insertions, 1 deletions
diff --git a/src/clients/klist/ChangeLog b/src/clients/klist/ChangeLog index b7120478f..ab75d77a1 100644 --- 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 e2414013d..904d25473 100644 --- 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 deb5f44bc..5d79a52e4 100644 --- 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; |