diff options
| author | Mark Kriegsman <1334634+kriegsman@users.noreply.github.com> | 2019-05-15 13:46:59 +0300 |
|---|---|---|
| committer | Mark Kriegsman <1334634+kriegsman@users.noreply.github.com> | 2019-05-15 13:46:59 +0300 |
| commit | 6b6c9c1c35f235e846334d9cd8984b4b4399f471 (patch) | |
| tree | ab63ac3ff7812c69f33c8cb4531e66bd4884a2ff | |
| parent | 403464a499a8feffa48f6f85d205550b9bc9c89b (diff) | |
Removed conflicting (and unneeded) typedef of 'boolean', fixes #790
| -rw-r--r-- | platforms/esp/32/led_sysdefs_esp32.h | 2 | ||||
| -rw-r--r-- | platforms/esp/8266/led_sysdefs_esp8266.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/platforms/esp/32/led_sysdefs_esp32.h b/platforms/esp/32/led_sysdefs_esp32.h index 68e78239..5cd374e2 100644 --- a/platforms/esp/32/led_sysdefs_esp32.h +++ b/platforms/esp/32/led_sysdefs_esp32.h @@ -12,7 +12,7 @@ typedef volatile uint32_t RoReg; typedef volatile uint32_t RwReg; typedef unsigned long prog_uint32_t; -typedef bool boolean; + // Default to NOT using PROGMEM here #ifndef FASTLED_USE_PROGMEM diff --git a/platforms/esp/8266/led_sysdefs_esp8266.h b/platforms/esp/8266/led_sysdefs_esp8266.h index a3f6ac32..26dffdcf 100644 --- a/platforms/esp/8266/led_sysdefs_esp8266.h +++ b/platforms/esp/8266/led_sysdefs_esp8266.h @@ -12,7 +12,7 @@ typedef volatile uint32_t RoReg; typedef volatile uint32_t RwReg; typedef uint32_t prog_uint32_t; -typedef uint8_t boolean; + // Default to NOT using PROGMEM here #ifndef FASTLED_USE_PROGMEM |