diff options
| author | Danilo Almeida <dalmeida@mit.edu> | 2002-04-11 03:16:42 +0000 |
|---|---|---|
| committer | Danilo Almeida <dalmeida@mit.edu> | 2002-04-11 03:16:42 +0000 |
| commit | dbcd335a6d155b1c2f7c06e0248b70431dfc9902 (patch) | |
| tree | 893b8baae0afa2aed5c159975019cb5951fa67ec /src | |
| parent | a38c030fa2b520f4e0dd72b6b6b3d52caa30c409 (diff) | |
| download | krb5-dbcd335a6d155b1c2f7c06e0248b70431dfc9902.tar.gz krb5-dbcd335a6d155b1c2f7c06e0248b70431dfc9902.tar.xz krb5-dbcd335a6d155b1c2f7c06e0248b70431dfc9902.zip | |
* cc_file.c: Use _WIN32 instead of _WINSOCKAPI_ because
_WINSOCKAPI_ depends on the Winsock header used (i.e., Winsock 2
does not define this). What we are really trying to check for is
Win32. Include port-sockets.h for Win32. (NOTE: Why is
NEED_SOCKETS being defined after the inclusion of k5-int.h? That
is pretty useless... What we probably should do is more
consitently used NEED_SOCKETS instead of manually putting in
network code. However, some people would probably have issues
with the build being slower...)
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@14376 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/krb5/ccache/ChangeLog | 12 | ||||
| -rw-r--r-- | src/lib/krb5/ccache/cc_file.c | 4 |
2 files changed, 15 insertions, 1 deletions
diff --git a/src/lib/krb5/ccache/ChangeLog b/src/lib/krb5/ccache/ChangeLog index 9e364dd4c4..21e9b7b70c 100644 --- a/src/lib/krb5/ccache/ChangeLog +++ b/src/lib/krb5/ccache/ChangeLog @@ -1,3 +1,15 @@ +2002-04-10 Danilo Almeida <dalmeida@mit.edu> + + * cc_file.c: Use _WIN32 instead of _WINSOCKAPI_ because + _WINSOCKAPI_ depends on the Winsock header used (i.e., Winsock 2 + does not define this). What we are really trying to check for is + Win32. Include port-sockets.h for Win32. (NOTE: Why is + NEED_SOCKETS being defined after the inclusion of k5-int.h? That + is pretty useless... What we probably should do is more + consitently used NEED_SOCKETS instead of manually putting in + network code. However, some people would probably have issues + with the build being slower...) + 2001-10-10 Ezra Peisach <epeisach@mit.edu> * cc_file.c (krb5_fcc_read): Remove const from fourth argument to diff --git a/src/lib/krb5/ccache/cc_file.c b/src/lib/krb5/ccache/cc_file.c index 6ce23aabde..0028d37aea 100644 --- a/src/lib/krb5/ccache/cc_file.c +++ b/src/lib/krb5/ccache/cc_file.c @@ -85,8 +85,10 @@ fcc_nseq.c and fcc_read don't check return values a lot. #ifdef HAVE_NETINET_IN_H -#if !defined(_WINSOCKAPI_) && !defined(HAVE_MACSOCK_H) +#if !defined(_WIN32) && !defined(HAVE_MACSOCK_H) #include <netinet/in.h> +#else +#include "port-sockets.h" #endif #else #error find some way to use net-byte-order file version numbers. |