Re: Compiling vbetool

[Carl-Daniel Hailfinger <c-d.hailfinger.devel.2005-hi6Y0CQ0nG0@public.gmane.org>]

[-- Attachment #1: Type: text/plain, Size: 584 bytes --]

Rich Townsend schrieb:
> I'm sure this isn't the correct place to post such a question, but I
> could find no other appropriate forum. Has anyone run into a problem
> trying to compile Matthew Garret's vbetool? Specifically:
> 
> In file included from /usr/include/stdlib.h:416,
>                  from vbetool.c:14:
> /usr/include/sys/types.h:62: error: conflicting types for 'dev_t'
> /usr/include/linux/types.h:24: error: previous declaration of 'dev_t'
> was here

Yes, I posted a patch for that four days ago. Attached again.

Regards,
Carl-Daniel
-- 
http://www.hailfinger.org/

[-- Attachment #2: vbetool-fix.diff --]
[-- Type: text/x-patch, Size: 848 bytes --]

diff -urN vbetool-0.2/Makefile.am vbetool-0.2-modified/Makefile.am
--- vbetool-0.2/Makefile.am	2004-12-30 16:27:07.000000000 +0100
+++ vbetool-0.2-modified/Makefile.am	2005-02-03 21:58:16.000000000 +0100
@@ -12,4 +12,4 @@
 	$(RM) Makefile.in aclocal.m4 config.h.in stamp-h.in configure
 
 AM_CFLAGS = -g -Wall -Werror -pedantic
-AM_LDFLAGS = -lpci
+LIBS = -lpci
diff -urN vbetool-0.2/vbetool.c vbetool-0.2-modified/vbetool.c
--- vbetool-0.2/vbetool.c	2004-12-31 16:11:19.000000000 +0100
+++ vbetool-0.2-modified/vbetool.c	2005-02-03 22:02:53.000000000 +0100
@@ -8,7 +8,6 @@
 version 2
 */
 
-#include <pci/pci.h>
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -17,6 +16,7 @@
 #include <sys/ioctl.h>
 #include <sys/types.h>
 #include <sys/io.h>
+#include <pci/pci.h>
 #include <sys/kd.h>
 #include <sys/stat.h>
 #include <errno.h>