Kill unneeded #include wherever possible.

Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>

Patch doesn't break djgpp-dos and gmake (afaik) builds, so:

Acked-by: Idwer Vollering <vidwer+lists.flashrom@gmail.com>

Index: flashrom-include_cleanup/hwaccess.c
===================================================================
--- flashrom-include_cleanup/hwaccess.c (Revision 1056)
+++ flashrom-include_cleanup/hwaccess.c (Arbeitskopie)
@@ -21,10 +21,12 @@
#include <stdint.h>
#include <string.h>
#include <stdlib.h>
+#include <sys/types.h>
+#if !defined (__DJGPP__)
#include <unistd.h>
#include <fcntl.h>
-#include <sys/types.h>
#include <errno.h>
+#endif
#include "flash.h"

#if defined(__i386__) || defined(__x86_64__)
@@ -42,12 +44,14 @@

void get_io_perms(void)
{
+#if defined(__DJGPP__)
+ /* We have full permissions by default. */
+ return;
+#else
#if defined (__sun) && (defined(__i386) || defined(__amd64))
if (sysi86(SI86V86, V86SC_IOPL, PS_IOPL) != 0) {
#elif defined(__FreeBSD__) || defined (__DragonFly__)
if ((io_fd = open("/dev/io", O_RDWR)) < 0) {
-#elif __DJGPP__
- if (0) {
#else
if (iopl(3) != 0) {
#endif
@@ -55,6 +59,7 @@
"You need to be root.\n", strerror(errno));
exit(1);
}
+#endif
}

void release_io_perms(void)
Index: flashrom-include_cleanup/physmap.c
===================================================================
--- flashrom-include_cleanup/physmap.c (Revision 1056)
+++ flashrom-include_cleanup/physmap.c (Arbeitskopie)
@@ -23,13 +23,17 @@
#include <unistd.h>
#include <stdio.h>
#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
#include <stdlib.h>
#include <string.h>
-#include <errno.h>
#include "flash.h"

+/* Do we need any file access or ioctl for physmap or MSR? */
+#if !defined(__DJGPP__)
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <errno.h>
+#endif
+
#ifdef __DJGPP__
#include <dpmi.h>
#include <sys/nearptr.h>
Index: flashrom-include_cleanup/chipset_enable.c
===================================================================
--- flashrom-include_cleanup/chipset_enable.c (Revision 1056)
+++ flashrom-include_cleanup/chipset_enable.c (Arbeitskopie)
@@ -27,12 +27,10 @@

#define _LARGEFILE64_SOURCE

-#include <unistd.h>
#include <stdlib.h>
#include <string.h>
#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
+#include <unistd.h>
#include "flash.h"

#if defined(__i386__) || defined(__x86_64__)
Index: flashrom-include_cleanup/internal.c
===================================================================
--- flashrom-include_cleanup/internal.c (Revision 1056)
+++ flashrom-include_cleanup/internal.c (Arbeitskopie)
@@ -21,10 +21,7 @@
#include <stdint.h>
#include <string.h>
#include <stdlib.h>
-#include <fcntl.h>
#include <sys/types.h>
-#include <sys/stat.h>
-#include <errno.h>
#include "flash.h"

#if NEED_PCI == 1

--
http://www.hailfinger.org/

_______________________________________________
flashrom mailing list
flashrom@flashrom.org
http://www.flashrom.org/mailman/listinfo/flashrom