From: Johan Danielsson <joda+openafs@pdc.kth.se>
Date: Tue, 8 Mar 2005 22:09:29 +0000 (+0000)
Subject: linux-osi-gettime-avoid-collision-20050308
X-Git-Tag: openafs-devel-1_5_0~732
X-Git-Url: http://git.openafs.org/?p=openafs.git;a=commitdiff_plain;h=a91a5fc68658f845f18d288925d4ef0498e29f93

linux-osi-gettime-avoid-collision-20050308

FIXES 17802

don't reuse tv as a variable name in osi_GetTime macro
---

diff --git a/src/afs/LINUX/osi_machdep.h b/src/afs/LINUX/osi_machdep.h
index 83f6b1a..03ba34e 100644
--- a/src/afs/LINUX/osi_machdep.h
+++ b/src/afs/LINUX/osi_machdep.h
@@ -62,10 +62,10 @@
 #ifdef AFS_LINUX_64BIT_KERNEL
 #define osi_GetTime(V)                                 \
     do {                                               \
-       struct timeval tv;                              \
-       do_gettimeofday(&tv);                           \
-       (V)->tv_sec = (afs_int32)tv.tv_sec;             \
-       (V)->tv_usec = (afs_int32)tv.tv_usec;           \
+       struct timeval __afs_tv;                              \
+       do_gettimeofday(&__afs_tv);                           \
+       (V)->tv_sec = (afs_int32)__afs_tv.tv_sec;             \
+       (V)->tv_usec = (afs_int32)__afs_tv.tv_usec;           \
     } while (0)
 #else
 #define osi_GetTime(V) do_gettimeofday((V))