From b3cda605a51207161f1bf49c6aca89468f19d002 Mon Sep 17 00:00:00 2001 From: Benjamin Valentin Date: Wed, 25 Aug 2021 15:45:43 +0200 Subject: [PATCH] pkg/paho-mqtt: remove workaround for stm32 --- ...nt-C-skip-SUCCESS-enum-on-STM32-cpus.patch | 31 ------------------- 1 file changed, 31 deletions(-) delete mode 100644 pkg/paho-mqtt/patches/0001-MQTTClient-C-skip-SUCCESS-enum-on-STM32-cpus.patch diff --git a/pkg/paho-mqtt/patches/0001-MQTTClient-C-skip-SUCCESS-enum-on-STM32-cpus.patch b/pkg/paho-mqtt/patches/0001-MQTTClient-C-skip-SUCCESS-enum-on-STM32-cpus.patch deleted file mode 100644 index 107ff6205000..000000000000 --- a/pkg/paho-mqtt/patches/0001-MQTTClient-C-skip-SUCCESS-enum-on-STM32-cpus.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 75774342cbd175287ccd3190c76db0b07314b3cf Mon Sep 17 00:00:00 2001 -From: Alexandre Abadie -Date: Sun, 7 Jun 2020 10:27:56 +0200 -Subject: [PATCH 1/1] MQTTClient-C: skip SUCCESS enum on STM32 cpus - ---- - MQTTClient-C/src/MQTTClient.h | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/MQTTClient-C/src/MQTTClient.h b/MQTTClient-C/src/MQTTClient.h -index b612341..4f1dfba 100755 ---- a/MQTTClient-C/src/MQTTClient.h -+++ b/MQTTClient-C/src/MQTTClient.h -@@ -54,7 +54,14 @@ - enum QoS { QOS0, QOS1, QOS2, SUBFAIL=0x80 }; - - /* all failure return codes must be negative */ -+#if !defined(CPU_LINE_STM32F030x4) && !defined(CPU_LINE_STM32MP157Cxx) && \ -+ defined(CPU_STM32) -+/* the SUCCESS enum is defined for all stm32. -+ Since it contains the same value, we just skip its definition here for them. */ -+enum returnCode { BUFFER_OVERFLOW = -2, FAILURE = -1}; -+#else - enum returnCode { BUFFER_OVERFLOW = -2, FAILURE = -1, SUCCESS = 0 }; -+#endif - - /* The Platform specific header must define the Network and Timer structures and functions - * which operate on them. --- -2.25.1 -