* krb.h: Do not include winsock.h for Win32, since we already use

port-sockets.h.  This avoids winsock.h vs winsock2.h issues.

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

diff --git a/src/include/kerberosIV/ChangeLog b/src/include/kerberosIV/ChangeLog
index 896a07faa01acd81bb2f7539d05ba5c8a270a613..96700cfdf2c039709d52cf497a2a2c3c6be16cf8 100644 (file)
--- a/src/include/kerberosIV/ChangeLog
+++ b/src/include/kerberosIV/ChangeLog
@@ -1,3 +1,8 @@
+2002-04-10  Danilo Almeida  <dalmeida@mit.edu>
+
+       * krb.h: Do not include winsock.h for Win32, since we already use
+       port-sockets.h.  This avoids winsock.h vs winsock2.h issues.
+
 2002-03-11  Ken Raeburn  <raeburn@mit.edu>
 
        * lsb_addr_cmp.h (krb4int_address_less): Declare.

diff --git a/src/include/kerberosIV/krb.h b/src/include/kerberosIV/krb.h
index cec73ef231a73bc35f0c742d21025d9c16249932..ed90e0711d8f903702d5d2e590107b8aa2c7c4de 100644 (file)
--- a/src/include/kerberosIV/krb.h
+++ b/src/include/kerberosIV/krb.h
@@ -34,7 +34,6 @@
 #include <kerberosIV/des.h>
 
 #ifdef _WINDOWS
-#include <winsock.h>
 #include <time.h>
 #endif /* _WINDOWS */