Nick: carldani
E-mail: none
Board: portability fixes
Contents: 
Index: hwaccess.c
===================================================================
--- hwaccess.c	(Revision 1671)
+++ hwaccess.c	(Arbeitskopie)
@@ -38,10 +38,9 @@
 #include <stdlib.h>
 #include <sys/types.h>
 #if !defined (__DJGPP__) && !defined(__LIBPAYLOAD__)
+/* No file access needed to get hardware access permissions. */
 #include <unistd.h>
 #include <fcntl.h>
-#endif
-#if !defined (__DJGPP__)
 #include <errno.h>
 #endif
 #include "flash.h"
Index: internal.c
===================================================================
--- internal.c	(Revision 1671)
+++ internal.c	(Arbeitskopie)
@@ -172,8 +172,10 @@
 	int not_a_laptop = 0;
 	const char *board_vendor = NULL;
 	const char *board_model = NULL;
+#if defined (__i386__) || defined (__x86_64__) || defined (__arm__)
 	const char *cb_vendor = NULL;
 	const char *cb_model = NULL;
+#endif
 	char *arg;
 
 	arg = extract_programmer_param("boardenable");
Index: physmap.c
===================================================================
--- physmap.c	(Revision 1671)
+++ physmap.c	(Arbeitskopie)
@@ -31,8 +31,8 @@
 #if !defined(__DJGPP__) && !defined(__LIBPAYLOAD__)
 #include <sys/stat.h>
 #include <fcntl.h>
+#endif
 #include <errno.h>
-#endif
 
 #ifdef __DJGPP__
 #include <dpmi.h>
Index: flashrom.c
===================================================================
--- flashrom.c	(Revision 1671)
+++ flashrom.c	(Arbeitskopie)
@@ -32,6 +32,7 @@
 #include <errno.h>
 #include <ctype.h>
 #include <getopt.h>
+#include <inttypes.h>
 #if HAVE_UTSNAME == 1
 #include <sys/utsname.h>
 #endif
@@ -1168,8 +1169,8 @@
 		return 1;
 	}
 	if (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);
+		msg_gerr("Error: Image size (%" PRIi64 " B) doesn't match the flash chip's size (%ld B)!\n",
+			 (int64_t)image_stat.st_size, size);
 		fclose(image);
 		return 1;
 	}