From: Heimdal Developers <heimdal-discuss@sics.se>
Date: Wed, 24 Nov 2010 10:35:48 +0000 (+0000)
Subject: Import of code from heimdal
X-Git-Tag: upstream/1.8.0_pre1^2~4461
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=f5fb20a0e364ee58020e8d4a244752e88ea619fa;p=packages%2Fo%2Fopenafs.git

Import of code from heimdal

This commit updates the code imported from heimdal to
9fc90e01b55966b6a3e5a161b4806a5171af789d (switch-from-svn-to-git-1704-g9fc90e0)

Upstream changes are:

Simon Wilkinson (1):
      roken: Remove multiple prototype for hstrerror

Change-Id: I74c269b37f1b4c39db7de770d56247198c295dfe
Reviewed-on: http://gerrit.openafs.org/3381
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 61ca17713..0d5ddb286 100644
--- a/src/external/heimdal-last
+++ b/src/external/heimdal-last
@@ -1 +1 @@
-f317b91b1b4b8d030fc2ab188b6aa526e9e7cb84
+9fc90e01b55966b6a3e5a161b4806a5171af789d
diff --git a/src/external/heimdal/roken/roken.h.in b/src/external/heimdal/roken/roken.h.in
index 755d8f8e6..41e33f043 100644
--- a/src/external/heimdal/roken/roken.h.in
+++ b/src/external/heimdal/roken/roken.h.in
@@ -544,7 +544,6 @@ int ROKEN_LIB_FUNCTION rk_strerror_r(int, char *, size_t);
 #endif
 /* This causes a fatal error under Psoriasis */
 #ifndef SunOS
-const char * ROKEN_LIB_FUNCTION hstrerror(int);
 ROKEN_LIB_FUNCTION const char * ROKEN_LIB_CALL hstrerror(int);
 #endif
 #endif