aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Arduino.mk2
-rw-r--r--HISTORY.md3
2 files changed, 3 insertions, 2 deletions
diff --git a/Arduino.mk b/Arduino.mk
index 02efc4b..767f493 100644
--- a/Arduino.mk
+++ b/Arduino.mk
@@ -785,7 +785,7 @@ else
endif
# Using += instead of =, so that CPPFLAGS can be set per sketch level
-CPPFLAGS += -$(MCU_FLAG_NAME)=$(MCU) -DF_CPU=$(F_CPU) -DARDUINO=$(ARDUINO_VERSION) \
+CPPFLAGS += -$(MCU_FLAG_NAME)=$(MCU) -DF_CPU=$(F_CPU) -DARDUINO=$(ARDUINO_VERSION) -D__PROG_TYPES_COMPAT__ \
-I. -I$(ARDUINO_CORE_PATH) -I$(ARDUINO_VAR_PATH)/$(VARIANT) \
$(SYS_INCLUDES) $(USER_INCLUDES) -Wall -ffunction-sections \
-fdata-sections
diff --git a/HISTORY.md b/HISTORY.md
index 2a6c5a5..99711e5 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -7,7 +7,8 @@ I tried to give credit whenever possible. If I have missed anyone, kindly add it
### 1.3.2 (in development)
- Fix: Add arduino-mk-vars.md file to RPM SPECfile. (https://github.com/sej7278)
- Fix: Add avr-libc/malloc.c and realloc.c to included core files. Fixes issue #163 (https://github.com/sej7278)
-- Fix: Add "gpio" to the list of isp that don't have a port. (Issue #165, #166) (@sej7278)
+- Fix: Add "gpio" to the list of isp that don't have a port. (Issue #165, #166) (https://github.com/sej7278)
+- Fix: Add "-D__PROG_TYPES_COMPAT__" to the avr-g++ compiler flags to match IDE. (https://github.com/sej7278)
### 1.3.1 (2014-02-04)
- Fix: BUNDLED_AVR_TOOLS_DIR is now set properly when using only arduino-core and not the whole arduino package. (https://github.com/sej7278)