From 7cb4db8f41d20d2c9d9c9a6830a362eebaeb42ed Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Wed, 20 Apr 2011 11:19:15 +0100 Subject: linux-user/arm/nwfpe: rename REG_PC to ARM_REG_PC The REG_PC constant used in the ARM nwfpe code is fine in the kernel but when used in qemu can clash with a definition in the host system include files (in particular on Ubuntu Lucid SPARC, including signal.h will define a REG_PC). Rename the constant to avoid this issue. Signed-off-by: Peter Maydell Signed-off-by: Aurelien Jarno --- linux-user/arm/nwfpe/fpa11.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'linux-user/arm/nwfpe/fpa11.h') diff --git a/linux-user/arm/nwfpe/fpa11.h b/linux-user/arm/nwfpe/fpa11.h index f17647bdb9..002b3cbb82 100644 --- a/linux-user/arm/nwfpe/fpa11.h +++ b/linux-user/arm/nwfpe/fpa11.h @@ -111,7 +111,7 @@ static inline void writeConditionCodes(unsigned int x) cpsr_write(user_registers,x,CPSR_NZCV); } -#define REG_PC 15 +#define ARM_REG_PC 15 unsigned int EmulateAll(unsigned int opcode, FPA11* qfpa, CPUARMState* qregs); -- cgit v1.2.3