From 4e2fb0ee3ebbdf1f2da6ca1a3937f63eeac647b4 Mon Sep 17 00:00:00 2001 From: Michael Karcher Date: Tue, 12 Jan 2010 23:29:26 +0000 Subject: Don't use "byte" as identifier Some mingw declares a global identifier "byte", causing -Werror -Wshadow to break compilation. This patch renames all identifiers called "byte". Corresponding to flashrom svn r861. Signed-off-by: Michael Karcher Acked-by: Carl-Daniel Hailfinger --- chipdrivers.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'chipdrivers.h') diff --git a/chipdrivers.h b/chipdrivers.h index e2c698b62..e7261e071 100644 --- a/chipdrivers.h +++ b/chipdrivers.h @@ -46,7 +46,7 @@ int spi_chip_write_256(struct flashchip *flash, uint8_t *buf); int spi_chip_read(struct flashchip *flash, uint8_t *buf, int start, int len); uint8_t spi_read_status_register(void); int spi_disable_blockprotect(void); -int spi_byte_program(int addr, uint8_t byte); +int spi_byte_program(int addr, uint8_t databyte); int spi_nbyte_program(int addr, uint8_t *bytes, int len); int spi_nbyte_read(int addr, uint8_t *bytes, int len); int spi_read_chunked(struct flashchip *flash, uint8_t *buf, int start, int len, int chunksize); -- cgit v1.2.3