Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/mipsco/include Prefix variables in a macro with an ...



details:   https://anonhg.NetBSD.org/src/rev/67bb592e0a72
branches:  trunk
changeset: 581894:67bb592e0a72
user:      he <he%NetBSD.org@localhost>
date:      Thu Jun 09 13:45:31 2005 +0000

description:
Prefix variables in a macro with an underscore to avoid shadowing problems.

diffstat:

 sys/arch/mipsco/include/intr.h |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (25 lines):

diff -r 7354ac70eb25 -r 67bb592e0a72 sys/arch/mipsco/include/intr.h
--- a/sys/arch/mipsco/include/intr.h    Thu Jun 09 13:29:57 2005 +0000
+++ b/sys/arch/mipsco/include/intr.h    Thu Jun 09 13:45:31 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intr.h,v 1.9 2002/01/14 19:08:35 soren Exp $   */
+/*     $NetBSD: intr.h,v 1.10 2005/06/09 13:45:31 he Exp $     */
 
 /*
  * Copyright (c) 1998 Jonathan Stone.  All rights reserved.
@@ -79,12 +79,12 @@
  */
 #define setsoft(x)     do {                    \
        extern u_int ssir;                      \
-       int s;                                  \
+       int _s;                                 \
                                                \
-       s = splhigh();                          \
+       _s = splhigh();                         \
        ssir |= 1 << (x);                       \
        _setsoftintr(MIPS_SOFT_INT_MASK_1);     \
-       splx(s);                                \
+       splx(_s);                               \
 } while (0)
 
 #define softintr_schedule(arg)                                         \



Home | Main Index | Thread Index | Old Index