diff options
authorIdwer Vollering <>2010-12-26 23:55:19 +0000
committerMichael Karcher <>2010-12-26 23:55:19 +0000
commit1a6162ed8d473c30a785e8e623cbe0e540bd4b4f (patch)
parentecc67072b63430877e160da628f69a2ef2f34735 (diff)
Compilation fix for djgpp
This corrects a djgpp build error, seen with r1232 and later. pcidev.c:210: error: conflicting types for 'rpci_write_long' programmer.h:226: error: previous declaration of 'rpci_write_long' was here Corresponding to flashrom svn r1249. Signed-off-by: Idwer Vollering <> Acked-by: Michael Karcher <>
1 files changed, 3 insertions, 3 deletions
diff --git a/programmer.h b/programmer.h
index 345b4f3..7bd1405 100644
--- a/programmer.h
+++ b/programmer.h
@@ -221,9 +221,9 @@ uint32_t pcidev_init(uint16_t vendor_id, uint32_t bar, const struct pcidev_statu
/* rpci_write_* are reversible writes. The original PCI config space register
* contents will be restored on shutdown.
-int rpci_write_byte(struct pci_dev *dev, int reg, u8 data);
-int rpci_write_word(struct pci_dev *dev, int reg, u16 data);
-int rpci_write_long(struct pci_dev *dev, int reg, u32 data);
+int rpci_write_byte(struct pci_dev *dev, int reg, uint8_t data);
+int rpci_write_word(struct pci_dev *dev, int reg, uint16_t data);
+int rpci_write_long(struct pci_dev *dev, int reg, uint32_t data);
/* print.c */
OpenPOWER on IntegriCloud