diff options
author | Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at> | 2013-02-04 04:38:42 +0000 |
---|---|---|
committer | Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at> | 2013-02-04 04:38:42 +0000 |
commit | 328aae55ddd81fb6601e969a27902d028afe110e (patch) | |
tree | 81738c13224127bddc2f02aa6b62e1281a820354 /flashrom.c | |
parent | 85845a2cef19031706149ae2e5db20cd6cfaffc9 (diff) | |
download | flashrom-328aae55ddd81fb6601e969a27902d028afe110e.zip flashrom-328aae55ddd81fb6601e969a27902d028afe110e.tar.gz |
Fix building for MacOSX
- Add a new macro named IS_MACOSX to hwaccess.c and use it to enable iopl().
This was broken since r1638. This fix does *not* restore the very permissive
concept where iopl() was activated in an #else branch that was inplace before
r1638.
- Make printing the image file's size in flashrom.c platform independent.
Bonus: remove definitions of off64_t and lseek64 which are not necessary
anymore for about 1000 commits.
Thanks to SJ for reporting the issue and testing the solution.
Corresponding to flashrom svn r1648.
Signed-off-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
Acked-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
Diffstat (limited to 'flashrom.c')
-rw-r--r-- | flashrom.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1121,8 +1121,8 @@ int read_buf_from_file(unsigned char *buf, unsigned long size, return 1; } if (image_stat.st_size != size) { - msg_gerr("Error: Image size (%ld B) doesn't match the flash chip's size (%ld B)!\n", - image_stat.st_size, size); + msg_gerr("Error: Image size (%jd B) doesn't match the flash chip's size (%ld B)!\n", + (intmax_t)image_stat.st_size, size); fclose(image); return 1; } |