From d84e235b5f94989e704ae59505ae08b8ea2fd87e Mon Sep 17 00:00:00 2001 From: Jason Tranchida Date: Sun, 14 Nov 2021 22:44:25 -0800 Subject: Fix lib8tion compile failure on RISCV ESP32 chips --- src/lib8tion.h | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'src/lib8tion.h') diff --git a/src/lib8tion.h b/src/lib8tion.h index 0cc3baa4..80e27100 100644 --- a/src/lib8tion.h +++ b/src/lib8tion.h @@ -834,10 +834,7 @@ public: uint16_t operator*(uint16_t v) { return (v*i) + ((v*f)>>F); } int32_t operator*(int32_t v) { return (v*i) + ((v*f)>>F); } int16_t operator*(int16_t v) { return (v*i) + ((v*f)>>F); } -#ifdef FASTLED_ARM - int operator*(int v) { return (v*i) + ((v*f)>>F); } -#endif -#ifdef FASTLED_APOLLO3 +#if defined(FASTLED_ARM) | defined(FASTLED_RISCV) | defined(FASTLED_APOLLO3) int operator*(int v) { return (v*i) + ((v*f)>>F); } #endif }; @@ -846,10 +843,7 @@ template static uint32_t operator*(uint32_t v, q & template static uint16_t operator*(uint16_t v, q & q) { return q * v; } template static int32_t operator*(int32_t v, q & q) { return q * v; } template static int16_t operator*(int16_t v, q & q) { return q * v; } -#ifdef FASTLED_ARM -template static int operator*(int v, q & q) { return q * v; } -#endif -#ifdef FASTLED_APOLLO3 +#if defined(FASTLED_ARM) | defined(FASTLED_RISCV) | defined(FASTLED_APOLLO3) template static int operator*(int v, q & q) { return q * v; } #endif -- cgit v1.2.3