From: Ben Kaduk <kaduk@mit.edu>
Date: Tue, 15 Oct 2013 20:00:01 +0000 (-0400)
Subject: Adjust for microtime() ABI on all XBSD
X-Git-Tag: upstream/1.6.6_pre2^2~32
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=4914a6355d5cc7b6704706f4ec211b5f300cc682;p=packages%2Fo%2Fopenafs.git

Adjust for microtime() ABI on all XBSD

On the BSDs, struct timeval is not two 32-bit integers like our
struct clock, so the ABI is quite incompatible.  Use the native type
for the function call and translate to our local type accordingly.

Unlike on master, there was no workaround in the FreeBSD kernel build
to remove.

Reviewed-on: http://gerrit.openafs.org/10340
Reviewed-by: Jeffrey Hutzelman <jhutz@cmu.edu>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Antoine Verheijen <apv@ualberta.ca>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
(cherry picked from commit 1bdcc3c7bca092f189f434f1f7b174090c24250c)

Change-Id: I54cb609f80bc35fb09a5026c964ba28ae860f3f5
Reviewed-on: http://gerrit.openafs.org/10374
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Andrew Deason <adeason@sinenomine.net>
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
Reviewed-by: Stephan Wiesand <stephan.wiesand@desy.de>
---

diff --git a/src/rx/rx_clock.h b/src/rx/rx_clock.h
index 2bdc0b81e..081043244 100644
--- a/src/rx/rx_clock.h
+++ b/src/rx/rx_clock.h
@@ -92,7 +92,7 @@ extern int clock_nUpdates;
 #if defined(AFS_SGI61_ENV) || defined(AFS_HPUX_ENV) || defined(AFS_LINUX_64BIT_KERNEL)
 #define clock_GetTime(cv) osi_GetTime((osi_timeval_t *)cv)
 #else
-#if (defined(AFS_AIX51_ENV) && defined(AFS_64BIT_KERNEL)) || (defined(AFS_DARWIN100_ENV) && defined(__amd64__)) || defined(AFS_NBSD_ENV)
+#if (defined(AFS_AIX51_ENV) && defined(AFS_64BIT_KERNEL)) || (defined(AFS_DARWIN100_ENV) && defined(__amd64__)) || defined(AFS_XBSD_ENV)
 #define        clock_GetTime(cv)                               \
     BEGIN                                              \
        struct timeval tv;                              \