From: Andrew Deason Date: Fri, 14 Aug 2009 21:17:11 +0000 (-0500) Subject: Make osi_GetTime work on 64-bit libuafs X-Git-Tag: openafs-devel-1_5_74~50 X-Git-Url: https://git.openafs.org/?p=openafs.git;a=commitdiff_plain;h=d0f2ffcaa3728bbcccf63b37ab1a52e8b45ede96 Make osi_GetTime work on 64-bit libuafs libuafs was previously using an implementation of osi_GetTime (and thus clock_GetTime) that required 32-bit time_t's to work properly. Instead, just use the non-kernel osi_GetTime for UKERNEL, since we're just in userspace either way. Change-Id: I4f2d060f7e2aaeaaa3fe164aca6bee5333de4583 Reviewed-on: http://gerrit.openafs.org/1714 Reviewed-by: Derrick Brashear Tested-by: Derrick Brashear --- diff --git a/src/rx/rx_clock.h b/src/rx/rx_clock.h index e375106..38bb130 100644 --- a/src/rx/rx_clock.h +++ b/src/rx/rx_clock.h @@ -42,8 +42,8 @@ struct clock { afs_int32 usec; /* Microseconds since clock_Init */ }; -#ifndef KERNEL -#if defined(AFS_USE_GETTIMEOFDAY) || defined(AFS_PTHREAD_ENV) +#if !defined(KERNEL) || defined(UKERNEL) +#if defined(AFS_USE_GETTIMEOFDAY) || defined(AFS_PTHREAD_ENV) || defined(UKERNEL) #define clock_Init() #define clock_NewTime() #define clock_UpdateTime() diff --git a/src/rx/rx_packet.h b/src/rx/rx_packet.h index ab324d5..7028825 100644 --- a/src/rx/rx_packet.h +++ b/src/rx/rx_packet.h @@ -12,11 +12,9 @@ #if defined(AFS_NT40_ENV) #include "rx_xmit_nt.h" #endif -#ifndef UKERNEL #ifndef AFS_NT40_ENV #include #endif /* !AFS_NT40_ENV */ -#endif /* !UKERNEL */ /* this file includes the macros and decls which depend on packet * format, and related packet manipulation macros. Note that code * which runs at NETPRI should not sleep, or AIX will panic */