From c71759d3d3668235e0f44e56e224e226ee09ee23 Mon Sep 17 00:00:00 2001 From: Stefan Tauner Date: Sat, 23 May 2015 23:59:23 +0000 Subject: hwaccess.h: fix compilation on OSX DirectHW provides prototypes for out[bwl] and in[bwl], but we still need to define the respective OUT[BWL] and IN[BWL] binding macros. Apparently this has been broken since r1864 (or January 2015). Corresponding to flashrom svn r1890. Signed-off-by: Stefan Tauner Acked-by: Stefan Tauner --- hwaccess.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/hwaccess.h b/hwaccess.h index 5378361..3e46192 100644 --- a/hwaccess.h +++ b/hwaccess.h @@ -231,11 +231,6 @@ cpu_to_be(64) #define INL(x) __extension__ ({ u_int inl_tmp = (x); inl(inl_tmp); }) #else -#if defined(__MACH__) && defined(__APPLE__) - /* Header is part of the DirectHW library. */ - #include -#else - #if defined (__sun) /* Note different order for outb */ #define OUTB(x,y) outb(y, x) @@ -259,6 +254,12 @@ cpu_to_be(64) #define INL inportl #else + +#if defined(__MACH__) && defined(__APPLE__) + /* Header is part of the DirectHW library. */ + #include +#endif + /* This is the usual glibc interface. */ #define OUTB outb #define OUTW outw @@ -269,7 +270,6 @@ cpu_to_be(64) #endif #endif #endif -#endif #if defined(__NetBSD__) || defined (__OpenBSD__) #if defined(__i386__) || defined(__x86_64__) -- cgit v1.1