From c59f4af054dda14f344b79f05adc748ccac1779b Mon Sep 17 00:00:00 2001 From: Alexandre Abadie Date: Thu, 16 Jul 2020 10:39:38 +0200 Subject: [PATCH] pkg/paho-mqtt: update patch to fix build with STM32 --- ...MQTTClient-C-skip-SUCCESS-enum-on-STM32-cpus.patch} | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) rename pkg/paho-mqtt/patches/{0001-MQTTClient-C-skip-SUCCESS-enum-on-STM32L1-L4-WB-cpus.patch => 0001-MQTTClient-C-skip-SUCCESS-enum-on-STM32-cpus.patch} (69%) diff --git a/pkg/paho-mqtt/patches/0001-MQTTClient-C-skip-SUCCESS-enum-on-STM32L1-L4-WB-cpus.patch b/pkg/paho-mqtt/patches/0001-MQTTClient-C-skip-SUCCESS-enum-on-STM32-cpus.patch similarity index 69% rename from pkg/paho-mqtt/patches/0001-MQTTClient-C-skip-SUCCESS-enum-on-STM32L1-L4-WB-cpus.patch rename to pkg/paho-mqtt/patches/0001-MQTTClient-C-skip-SUCCESS-enum-on-STM32-cpus.patch index 5983122588..38145a29a7 100644 --- a/pkg/paho-mqtt/patches/0001-MQTTClient-C-skip-SUCCESS-enum-on-STM32L1-L4-WB-cpus.patch +++ b/pkg/paho-mqtt/patches/0001-MQTTClient-C-skip-SUCCESS-enum-on-STM32-cpus.patch @@ -1,22 +1,22 @@ -From cbb94538de6b28513685779f542587129f888db6 Mon Sep 17 00:00:00 2001 +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 STM32L1/L4/WB cpus +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..a051199 100755 +index b612341..4f1dfba 100755 --- a/MQTTClient-C/src/MQTTClient.h +++ b/MQTTClient-C/src/MQTTClient.h @@ -54,7 +54,13 @@ enum QoS { QOS0, QOS1, QOS2, SUBFAIL=0x80 }; /* all failure return codes must be negative */ -+#if defined(CPU_FAM_STM32L4) || defined(CPU_FAM_STM32L1) || defined(CPU_FAM_STM32WB) || defined(CPU_FAM_STM32G4) -+/* the SUCCESS enum is also defined with stm32 L1, L4 and WB families. ++#if !defined(CPU_LINE_STM32F030x4) && 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