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 <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>

diff --git a/src/rx/rx_clock.h b/src/rx/rx_clock.h
index e37510655a9ea57db28a0e4c4281cce4a1edb324..38bb1306f573a7c73f3db10247eac69d396577d6 100644 (file)
--- 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 ab324d5a192cbf98fadaea7dbe69e6dec3a043ed..7028825b79d92ab590f4fda84efc49b7a3fa148b 100644 (file)
--- 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 <sys/uio.h>
 #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 */