diff options
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 9e364dd4c..21e9b7b70 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 6ce23aabd..0028d37ae 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. |