diff options
| author | Eric Anholt <eric@anholt.net> | 2008-10-06 16:59:16 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2008-10-06 17:00:29 -0700 |
| commit | 3621183cf4acef23414e8d69c34b1e587f52ec67 (patch) | |
| tree | 573314fa7855d03f8b483d512de3e23579f73d41 | |
| parent | 080d36648f92d3b9a559e5458687fa82afab411f (diff) | |
Fix bios_reader build against old servers.
The server's pci_device structure ends up conflicting with libpciaccess's.
Just don't include the server structure for this non-server tool.
| -rw-r--r-- | src/bios_reader/Makefile.am | 3 | ||||
| -rw-r--r-- | src/bios_reader/bios_reader.c | 3 | ||||
| -rw-r--r-- | src/i830_bios.h | 4 |
3 files changed, 9 insertions, 1 deletions
diff --git a/src/bios_reader/Makefile.am b/src/bios_reader/Makefile.am index c85081e7..9f1c45a5 100644 --- a/src/bios_reader/Makefile.am +++ b/src/bios_reader/Makefile.am @@ -1,4 +1,5 @@ -AM_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@ @XMODES_CFLAGS@ @PCIACCESS_CFLAGS@ +AM_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@ @XMODES_CFLAGS@ @PCIACCESS_CFLAGS@ \ + -DREG_DUMPER noinst_PROGRAMS = bios_reader $(BIOS_DUMPER) $(SWF_DUMPER) diff --git a/src/bios_reader/bios_reader.c b/src/bios_reader/bios_reader.c index 61b492d2..2a6906d4 100644 --- a/src/bios_reader/bios_reader.c +++ b/src/bios_reader/bios_reader.c @@ -38,6 +38,9 @@ #include "../i830_bios.h" +typedef uint8_t CARD8; +typedef uint16_t CARD16; +typedef uint32_t CARD32; #define _PARSE_EDID_ #include "edid.h" diff --git a/src/i830_bios.h b/src/i830_bios.h index 0a1f4ba6..39706ac6 100644 --- a/src/i830_bios.h +++ b/src/i830_bios.h @@ -29,7 +29,9 @@ #define _I830_BIOS_H_ #include <stdint.h> +#ifndef REG_DUMPER #include <xf86str.h> +#endif struct vbt_header { char signature[20]; /**< Always starts with 'VBT$' */ @@ -393,7 +395,9 @@ struct vch_bdb_22 { struct vch_panel_data panels[16]; } __attribute__((packed)); +#ifndef REG_DUMPER int i830_bios_init(ScrnInfoPtr pScrn); +#endif /* * Driver<->VBIOS interaction occurs through scratch bits in |