From d826928578947d1e24dc75303d64fd114756e689 Mon Sep 17 00:00:00 2001 From: Johan Danielsson Date: Fri, 11 Mar 2005 06:51:42 +0000 Subject: [PATCH] STABLE14-linux-osi-gettime-avoid-collision-20050308 FIXES 17802 don't reuse tv as a variable name in osi_GetTime macro (cherry picked from commit a91a5fc68658f845f18d288925d4ef0498e29f93) --- src/afs/LINUX/osi_machdep.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/afs/LINUX/osi_machdep.h b/src/afs/LINUX/osi_machdep.h index 83f6b1a6d..03ba34ef5 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)) -- 2.39.5