2010/6/21 Carl-Daniel Hailfinger <span dir="ltr"><<a href="mailto:c-d.hailfinger.devel.2006@gmx.net">c-d.hailfinger.devel.2006@gmx.net</a>></span><br><div class="gmail_quote"><blockquote class="gmail_quote" style="margin: 0pt 0pt 0pt 0.8ex; border-left: 1px solid rgb(204, 204, 204); padding-left: 1ex;">
Kill unneeded #include wherever possible.<br>
<br>
Signed-off-by: Carl-Daniel Hailfinger <<a href="mailto:c-d.hailfinger.devel.2006@gmx.net">c-d.hailfinger.devel.2006@gmx.net</a>><br></blockquote><div><br>Patch doesn't break djgpp-dos and gmake (afaik) builds, so:<br>
<br>Acked-by: Idwer Vollering <<a href="mailto:vidwer%2Blists.flashrom@gmail.com">vidwer+lists.flashrom@gmail.com</a>><br><br></div><blockquote class="gmail_quote" style="margin: 0pt 0pt 0pt 0.8ex; border-left: 1px solid rgb(204, 204, 204); padding-left: 1ex;">
<br>
Index: flashrom-include_cleanup/hwaccess.c<br>
===================================================================<br>
--- flashrom-include_cleanup/hwaccess.c (Revision 1056)<br>
+++ flashrom-include_cleanup/hwaccess.c (Arbeitskopie)<br>
@@ -21,10 +21,12 @@<br>
#include <stdint.h><br>
#include <string.h><br>
#include <stdlib.h><br>
+#include <sys/types.h><br>
+#if !defined (__DJGPP__)<br>
#include <unistd.h><br>
#include <fcntl.h><br>
-#include <sys/types.h><br>
#include <errno.h><br>
+#endif<br>
#include "flash.h"<br>
<br>
#if defined(__i386__) || defined(__x86_64__)<br>
@@ -42,12 +44,14 @@<br>
<br>
void get_io_perms(void)<br>
{<br>
+#if defined(__DJGPP__)<br>
+ /* We have full permissions by default. */<br>
+ return;<br>
+#else<br>
#if defined (__sun) && (defined(__i386) || defined(__amd64))<br>
if (sysi86(SI86V86, V86SC_IOPL, PS_IOPL) != 0) {<br>
#elif defined(__FreeBSD__) || defined (__DragonFly__)<br>
if ((io_fd = open("/dev/io", O_RDWR)) < 0) {<br>
-#elif __DJGPP__<br>
- if (0) {<br>
#else<br>
if (iopl(3) != 0) {<br>
#endif<br>
@@ -55,6 +59,7 @@<br>
"You need to be root.\n", strerror(errno));<br>
exit(1);<br>
}<br>
+#endif<br>
}<br>
<br>
void release_io_perms(void)<br>
Index: flashrom-include_cleanup/physmap.c<br>
===================================================================<br>
--- flashrom-include_cleanup/physmap.c (Revision 1056)<br>
+++ flashrom-include_cleanup/physmap.c (Arbeitskopie)<br>
@@ -23,13 +23,17 @@<br>
#include <unistd.h><br>
#include <stdio.h><br>
#include <sys/types.h><br>
-#include <sys/stat.h><br>
-#include <fcntl.h><br>
#include <stdlib.h><br>
#include <string.h><br>
-#include <errno.h><br>
#include "flash.h"<br>
<br>
+/* Do we need any file access or ioctl for physmap or MSR? */<br>
+#if !defined(__DJGPP__)<br>
+#include <sys/stat.h><br>
+#include <fcntl.h><br>
+#include <errno.h><br>
+#endif<br>
+<br>
#ifdef __DJGPP__<br>
#include <dpmi.h><br>
#include <sys/nearptr.h><br>
Index: flashrom-include_cleanup/chipset_enable.c<br>
===================================================================<br>
--- flashrom-include_cleanup/chipset_enable.c (Revision 1056)<br>
+++ flashrom-include_cleanup/chipset_enable.c (Arbeitskopie)<br>
@@ -27,12 +27,10 @@<br>
<br>
#define _LARGEFILE64_SOURCE<br>
<br>
-#include <unistd.h><br>
#include <stdlib.h><br>
#include <string.h><br>
#include <sys/types.h><br>
-#include <sys/stat.h><br>
-#include <fcntl.h><br>
+#include <unistd.h><br>
#include "flash.h"<br>
<br>
#if defined(__i386__) || defined(__x86_64__)<br>
Index: flashrom-include_cleanup/internal.c<br>
===================================================================<br>
--- flashrom-include_cleanup/internal.c (Revision 1056)<br>
+++ flashrom-include_cleanup/internal.c (Arbeitskopie)<br>
@@ -21,10 +21,7 @@<br>
#include <stdint.h><br>
#include <string.h><br>
#include <stdlib.h><br>
-#include <fcntl.h><br>
#include <sys/types.h><br>
-#include <sys/stat.h><br>
-#include <errno.h><br>
#include "flash.h"<br>
<br>
#if NEED_PCI == 1<br>
<font color="#888888"><br>
<br>
--<br>
<a href="http://www.hailfinger.org/" target="_blank">http://www.hailfinger.org/</a><br>
<br>
<br>
_______________________________________________<br>
flashrom mailing list<br>
<a href="mailto:flashrom@flashrom.org">flashrom@flashrom.org</a><br>
<a href="http://www.flashrom.org/mailman/listinfo/flashrom" target="_blank">http://www.flashrom.org/mailman/listinfo/flashrom</a><br>
</font></blockquote></div><br>