From: Heimdal Developers <heimdal-discuss@sics.se>
Date: Thu, 7 Apr 2011 18:39:30 +0000 (+0100)
Subject: Import of code from heimdal
X-Git-Tag: upstream/1.8.0_pre1^2~3887
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=21ed5186ae04a5a3026bfe115404bfa24ec27bdb;p=packages%2Fo%2Fopenafs.git

Import of code from heimdal

This commit updates the code imported from heimdal to
a597ccdde692709ab387cde21518f09eb501c5a1 (switch-from-svn-to-git-2063-ga597ccd)

Upstream changes are:

Simon Wilkinson (1):
      roken: Rename gettimeofday replacement

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

diff --git a/src/external/heimdal-last b/src/external/heimdal-last
index a481de1cc..581f02f5f 100644
--- a/src/external/heimdal-last
+++ b/src/external/heimdal-last
@@ -1 +1 @@
-987658325eb7bd6b10882cc4cdd224499e7f7a03
+a597ccdde692709ab387cde21518f09eb501c5a1
diff --git a/src/external/heimdal/roken/roken.h.in b/src/external/heimdal/roken/roken.h.in
index 7bc23de06..6051427ab 100644
--- a/src/external/heimdal/roken/roken.h.in
+++ b/src/external/heimdal/roken/roken.h.in
@@ -932,6 +932,7 @@ strptime (const char *, const char *, struct tm *);
 #endif
 
 #ifndef HAVE_GETTIMEOFDAY
+#define gettimeofday rk_gettimeofday
 ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL
 gettimeofday (struct timeval *, void *);
 #endif