From 0a9b03cb657ff86858b67b848951c962b5ed0484 Mon Sep 17 00:00:00 2001 From: Peter Grehan Date: Sat, 18 Jan 2003 11:20:06 +0000 Subject: [PATCH] Prepended underscores to macro local vars, avoiding gcc "declaration shadows global" warning Approved by: benno --- sys/powerpc/include/cpu.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/powerpc/include/cpu.h b/sys/powerpc/include/cpu.h index 19b0c727478..566b779160b 100644 --- a/sys/powerpc/include/cpu.h +++ b/sys/powerpc/include/cpu.h @@ -79,17 +79,17 @@ extern void __syncicache(void *, int); static __inline u_int64_t get_cyclecount(void) { - u_int32_t upper, lower; - u_int64_t time; + u_int32_t _upper, _lower; + u_int64_t _time; __asm __volatile( "mftb %0\n" "mftbu %1" - : "=r" (lower), "=r" (upper)); + : "=r" (_lower), "=r" (_upper)); - time = (u_int64_t)upper; - time = (time << 32) + lower; - return (time); + _time = (u_int64_t)_upper; + _time = (_time << 32) + _lower; + return (_time); } #define cpu_getstack(td) ((td)->td_frame->fixreg[1])