From 6e1283cbc26a0517a337dcd7d9301d1f857fa993 Mon Sep 17 00:00:00 2001
From: Assar Westerlund <assar@sics.se>
Date: Tue, 21 Aug 2001 15:32:07 +0000
Subject: [PATCH] remove all winsock.h for now, it does more harm than good
 under cygwin and if it should be used, the correct conditional needs to be
 found from <tol@stacken.kth.se>

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@10510 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 cf/roken-frag.m4     | 3 +--
 lib/des/rnd_keys.c   | 4 ----
 lib/roken/roken.h.in | 3 ---
 3 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/cf/roken-frag.m4 b/cf/roken-frag.m4
index 4cc7dfb43..11dcb85d6 100644
--- a/cf/roken-frag.m4
+++ b/cf/roken-frag.m4
@@ -89,7 +89,6 @@ AC_CHECK_HEADERS([\
 	usersec.h				\
 	util.h					\
 	vis.h					\
-	winsock.h				\
 ])
 	
 AC_REQUIRE([CHECK_NETINET_IP_AND_TCP])
@@ -621,4 +620,4 @@ LIB_roken="${LIB_roken} \$(LIB_crypt) \$(LIB_dbopen)"
 AC_SUBST(DIR_roken)dnl
 AC_SUBST(LIB_roken)dnl
 AC_SUBST(INCLUDES_roken)dnl
-])
\ No newline at end of file
+])
diff --git a/lib/des/rnd_keys.c b/lib/des/rnd_keys.c
index bd7458db3..04e7d8f90 100644
--- a/lib/des/rnd_keys.c
+++ b/lib/des/rnd_keys.c
@@ -74,10 +74,6 @@ RCSID("$Id$");
 #include <fcntl.h>
 #endif
 
-#ifdef HAVE_WINSOCK_H
-#include <winsock.h>
-#endif
-
 /*
  * Generate "random" data by checksumming a file.
  *
diff --git a/lib/roken/roken.h.in b/lib/roken/roken.h.in
index 9c34658a7..a17acf8a0 100644
--- a/lib/roken/roken.h.in
+++ b/lib/roken/roken.h.in
@@ -95,9 +95,6 @@ struct sockaddr_dl;
 #ifdef HAVE_SYSLOG_H
 #include <syslog.h>
 #endif
-#ifdef HAVE_WINSOCK_H
-#include <winsock.h>
-#endif
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
 #endif