From: Heimdal Developers <heimdal-discuss@sics.se>
Date: Mon, 22 Nov 2010 23:17:18 +0000 (+0000)
Subject: Import of code from heimdal
X-Git-Tag: upstream/1.8.0_pre1^2~4476
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=f26f4651516b36263fd1de3c3aaa461ce623e71d;p=packages%2Fo%2Fopenafs.git

Import of code from heimdal

This commit updates the code imported from heimdal to
bd78baf668eca011257f05fef8334e0967500456 (switch-from-svn-to-git-1696-gbd78baf)

Upstream changes are:

Jeffrey Altman (1):
      Windows: Include winsock2.h before ws2tcpip.h

Change-Id: I7eca90ad36d84ccec6ac416d82246f6b28f06948
Reviewed-on: http://gerrit.openafs.org/3360
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
Tested-by: Jeffrey Altman <jaltman@openafs.org>
---

diff --git a/src/external/heimdal-last b/src/external/heimdal-last
index ce45b85a1..0e30b39f9 100644
--- a/src/external/heimdal-last
+++ b/src/external/heimdal-last
@@ -1 +1 @@
-387b0fa7baf724cc260559ff8774c04e0e8f7487
+bd78baf668eca011257f05fef8334e0967500456
diff --git a/src/external/heimdal/roken/roken.h.in b/src/external/heimdal/roken/roken.h.in
index d06db3275..654a5ad56 100644
--- a/src/external/heimdal/roken/roken.h.in
+++ b/src/external/heimdal/roken/roken.h.in
@@ -54,7 +54,8 @@
 #ifdef HAVE_WINSOCK
 /* Declarations for Microsoft Windows */
 
-#include<ws2tcpip.h>
+#include <winsock2.h>
+#include <ws2tcpip.h>
 
 /*
  * error codes for inet_ntop/inet_pton