From: Danilo Almeida <dalmeida@mit.edu>
Date: Thu, 11 Apr 2002 03:19:07 +0000 (+0000)
Subject: * krb.h: Do not include winsock.h for Win32, since we already use
X-Git-Tag: krb5-1.3-alpha1~779
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=117bdd833185111bb6681b990acc4cb639bbd921;p=krb5.git

* 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 896a07faa..96700cfdf 100644
--- 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 cec73ef23..ed90e0711 100644
--- 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 */