* 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

diff --git a/src/lib/krb5/ccache/ChangeLog b/src/lib/krb5/ccache/ChangeLog
index 9e364dd4c4e7ecc006e5f86aa6d0f15eed325b85..21e9b7b70c34a0702e6474bf22fc714a436c0322 100644 (file)
--- 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 6ce23aabde8499f6e2963bbc1bce47bf6d2a73a7..0028d37aea29a2b1aaa65d32ef7c7cac9ce9fe40 100644 (file)
--- 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.