diff options
author | Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> | 2012-08-09 23:34:41 +0000 |
---|---|---|
committer | Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> | 2012-08-09 23:34:41 +0000 |
commit | 78a5798705bd92036a29516593d151cafb99c2fe (patch) | |
tree | adbb52deb6d42ab9f32ed347d18ff42384190c47 /physmap.c | |
parent | 7cd532fb0c2d1eea3e1d405de3e247f3710e82b2 (diff) | |
download | flashrom-78a5798705bd92036a29516593d151cafb99c2fe.zip flashrom-78a5798705bd92036a29516593d151cafb99c2fe.tar.gz |
Portability fixes and cleanups
Move Mac OS X IOKit/DirectHW availability checks in the Makefile from
compiler check to pciutils check.
Print the compiler error messages for feature detection.
Add DOS libpci in the Makefile includes only if a PCI-based programmer
was requested.
Restrict mmap usage in ich_descriptors_tool to Unix style systems.
Build ich_descriptors_tool with the correct .exe extension on
DOS/Windows.
Build ich_descriptors_tool by default on x86. (Patch by Stefan Tauner)
Print the Windows version instead of "unknown machine" on Windows.
Don't #define our own __DARWIN__, use the standard OS X detection
method.
Update the README.
Add more generated files to svn:ignore
Corresponding to flashrom svn r1567.
Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Diffstat (limited to 'physmap.c')
-rw-r--r-- | physmap.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -129,7 +129,7 @@ int setup_cpu_msr(int cpu) void cleanup_cpu_msr(void) { } -#elif defined(__DARWIN__) +#elif defined(__MACH__) && defined(__APPLE__) #define MEM_DEV "DirectHW" @@ -468,7 +468,7 @@ void cleanup_cpu_msr(void) #else -#ifdef __DARWIN__ +#if defined(__MACH__) && defined(__APPLE__) int setup_cpu_msr(int cpu) { // Always succeed for now |