From 9c4fe1e49777722998720f2684e56b6c98be04bc Mon Sep 17 00:00:00 2001 From: schodet Date: Sat, 5 May 2007 12:46:52 +0000 Subject: Fixed problems with avr-libc 1.4 and GCC 4. --- n/avr/common/io.h | 11 +++++++---- n/avr/make/Makefile.gen | 3 ++- 2 files changed, 9 insertions(+), 5 deletions(-) (limited to 'n') diff --git a/n/avr/common/io.h b/n/avr/common/io.h index 57c453d..8722eb1 100644 --- a/n/avr/common/io.h +++ b/n/avr/common/io.h @@ -29,10 +29,13 @@ /* Avr part. */ #include -#include - -/* No INTERRUPT as it is dangerous. */ -#undef INTERRUPT +#if __AVR_LIBC_VERSION__ < 10400UL +# include + /* No INTERRUPT as it is dangerous. */ +# undef INTERRUPT + /* SIGNAL is now ISR. */ +# define ISR SIGNAL +#endif #else /* HOST */ diff --git a/n/avr/make/Makefile.gen b/n/avr/make/Makefile.gen index 5193e43..0fa9b98 100644 --- a/n/avr/make/Makefile.gen +++ b/n/avr/make/Makefile.gen @@ -3,7 +3,8 @@ # Flags INCLUDES := -I$(BASE) -I$(BASE)/common -CFLAGS := -g -Wall -W -Wundef -Wno-unused-parameter $(OPTIMIZE) +CFLAGS := -g -Wall -W -Wundef -Wno-unused-parameter -Wno-pointer-sign \ + $(OPTIMIZE) ASFLAGS := -Wa,--gstabs CPPFLAGS := $(DEFS) $(INCLUDES) -MMD \ $(if $(CONFIGFILE),$(CONFIGFILE:%=-include %)) -- cgit v1.2.3