From 07a3d470845ce48606b80f5f2741ac629554d1b0 Mon Sep 17 00:00:00 2001 From: Eduard Iten Date: Tue, 13 Feb 2024 12:18:57 +0100 Subject: [PATCH 1/2] Fixed compile error on newest xtensa toolchain --- MySensors.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MySensors.h b/MySensors.h index ec01be347..92bf5efa8 100644 --- a/MySensors.h +++ b/MySensors.h @@ -96,11 +96,11 @@ #define _BV(x) (1<<(x)) //!< _BV #endif -#if !defined(min) && !defined(__linux__) +#if !defined(min) && !defined(__linux__) && !defined(ARDUINO_ARCH_ESP8266) #define min(a,b) ((a)<(b)?(a):(b)) //!< min #endif -#if !defined(max) && !defined(__linux__) +#if !defined(max) && !defined(__linux__) && !defined(ARDUINO_ARCH_ESP8266) #define max(a,b) ((a)>(b)?(a):(b)) //!< max #endif From e29754c96d9e4f6572ef65a122f69f6b279b7693 Mon Sep 17 00:00:00 2001 From: Eduard Iten Date: Tue, 13 Feb 2024 12:18:57 +0100 Subject: [PATCH 2/2] Fixed compile error on newest xtensa toolchain --- MySensors.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MySensors.h b/MySensors.h index ec01be347..9c86bba8f 100644 --- a/MySensors.h +++ b/MySensors.h @@ -96,11 +96,11 @@ #define _BV(x) (1<<(x)) //!< _BV #endif -#if !defined(min) && !defined(__linux__) +#if !defined(min) && !defined(__linux__) && !defined(ARDUINO_ARCH_ESP8266) && !defined(ARDUINO_ARCH_ESP32) #define min(a,b) ((a)<(b)?(a):(b)) //!< min #endif -#if !defined(max) && !defined(__linux__) +#if !defined(max) && !defined(__linux__) && !defined(ARDUINO_ARCH_ESP8266) && !defined(ARDUINO_ARCH_ESP32) #define max(a,b) ((a)>(b)?(a):(b)) //!< max #endif