summaryrefslogtreecommitdiffstats
path: root/hwaccess.h
diff options
context:
space:
mode:
authorMichael Karcher <flashrom@mkarcher.dialup.fu-berlin.de>2010-01-12 15:36:24 +0000
committerMichael Karcher <flashrom@mkarcher.dialup.fu-berlin.de>2010-01-12 15:36:24 +0000
commite7f3209487b8adb681dd720f9ae512c8ded26f6e (patch)
tree0de6c940c2288444810f571fabe0687c7e1ba40a /hwaccess.h
parent9cce2f536581da4f278005a621ad95de1e21b284 (diff)
downloadast2050-flashrom-e7f3209487b8adb681dd720f9ae512c8ded26f6e.zip
ast2050-flashrom-e7f3209487b8adb681dd720f9ae512c8ded26f6e.tar.gz
Enable -Wshadow, clean code for that
This is not just for fun. We hit a real bug on BSD with the outl macros. The macro variable tmp collided with the tmp from outer scope. second revision, now also taking care of inb/inw/inl. While that shadowing did not introduce bugs (yet), of course it breaks the build on BSD when -Wshadow is enabled. Corresponding to flashrom svn r860. Signed-off-by: Michael Karcher <flashrom@mkarcher.dialup.fu-berlin.de> Acked-by: Luc Verhaegen <libv@skynet.be>
Diffstat (limited to 'hwaccess.h')
-rw-r--r--hwaccess.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/hwaccess.h b/hwaccess.h
index 2bc2927..0729226 100644
--- a/hwaccess.h
+++ b/hwaccess.h
@@ -46,12 +46,12 @@
#include <machine/cpufunc.h>
#define off64_t off_t
#define lseek64 lseek
- #define OUTB(x, y) do { u_int tmp = (y); outb(tmp, (x)); } while (0)
- #define OUTW(x, y) do { u_int tmp = (y); outw(tmp, (x)); } while (0)
- #define OUTL(x, y) do { u_int tmp = (y); outl(tmp, (x)); } while (0)
- #define INB(x) __extension__ ({ u_int tmp = (x); inb(tmp); })
- #define INW(x) __extension__ ({ u_int tmp = (x); inw(tmp); })
- #define INL(x) __extension__ ({ u_int tmp = (x); inl(tmp); })
+ #define OUTB(x, y) do { u_int outb_tmp = (y); outb(outb_tmp, (x)); } while (0)
+ #define OUTW(x, y) do { u_int outw_tmp = (y); outw(outw_tmp, (x)); } while (0)
+ #define OUTL(x, y) do { u_int outl_tmp = (y); outl(outl_tmp, (x)); } while (0)
+ #define INB(x) __extension__ ({ u_int inb_tmp = (x); inb(inb_tmp); })
+ #define INW(x) __extension__ ({ u_int inw_tmp = (x); inw(inw_tmp); })
+ #define INL(x) __extension__ ({ u_int inl_tmp = (x); inl(inl_tmp); })
#else
#if defined(__DARWIN__)
#include <DirectIO/darwinio.h>
OpenPOWER on IntegriCloud