From: Heimdal Developers <heimdal-discuss@sics.se>
Date: Mon, 11 Apr 2011 02:13:08 +0000 (-0400)
Subject: Import of code from heimdal
X-Git-Tag: upstream/1.8.0_pre1^2~3879
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=83bce754727c9f2b4206d4a7744854616433006b;p=packages%2Fo%2Fopenafs.git

Import of code from heimdal

This commit updates the code imported from heimdal to
988355d9d0d1953e8c17c4b5c935938573efe4ba (switch-from-svn-to-git-2070-g988355d)

Upstream changes are:

Derrick Brashear (1):
      roken: Make tsearch build on windows

Change-Id: Ic0292c8cc7283c07ae56040c8e80b9b2cc99801f
Reviewed-on: http://gerrit.openafs.org/4454
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
---

diff --git a/src/external/heimdal-last b/src/external/heimdal-last
index 48c5ad9ce..8fba3a3ac 100644
--- a/src/external/heimdal-last
+++ b/src/external/heimdal-last
@@ -1 +1 @@
-2a32bf67f0a7c77b6adf6e7c23ec8abe7937a9ea
+988355d9d0d1953e8c17c4b5c935938573efe4ba
diff --git a/src/external/heimdal/roken/search.hin b/src/external/heimdal/roken/search.hin
index 9e45c2a9e..b4edcffbb 100644
--- a/src/external/heimdal/roken/search.hin
+++ b/src/external/heimdal/roken/search.hin
@@ -18,7 +18,9 @@
 #endif
 #endif
 
+#ifndef _WIN32
 #include <sys/cdefs.h>
+#endif
 #include <sys/types.h>
 
 typedef	enum {