linux-osi-gettime-avoid-collision-20050308
authorJohan Danielsson <joda+openafs@pdc.kth.se>
Tue, 8 Mar 2005 22:09:29 +0000 (22:09 +0000)
committerDerrick Brashear <shadow@dementia.org>
Tue, 8 Mar 2005 22:09:29 +0000 (22:09 +0000)
FIXES 17802

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

src/afs/LINUX/osi_machdep.h

index 83f6b1a..03ba34e 100644 (file)
 #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))