riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

pkg/paho-mqtt: update patch to fix build with STM32

Browse Source
This commit is contained in:
Alexandre Abadie 2020-07-16 10:39:38 +02:00
parent a8c04f5bea
commit c59f4af054
No known key found for this signature in database
GPG Key ID: 1C919A403CAE1405
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/paho-mqtt/patches/0001-MQTTClient-C-skip-SUCCESS-enum-on-STM32L1-L4-WB-cpus.patch → pkg/paho-mqtt/patches/0001-MQTTClient-C-skip-SUCCESS-enum-on-STM32-cpus.patch
View File

@ -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 <alexandre.abadie@inria.fr> From: Alexandre Abadie <alexandre.abadie@inria.fr>
Date: Sun, 7 Jun 2020 10:27:56 +0200 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 ++++++ MQTTClient-C/src/MQTTClient.h | 6 ++++++
1 file changed, 6 insertions(+) 1 file changed, 6 insertions(+)
diff --git a/MQTTClient-C/src/MQTTClient.h b/MQTTClient-C/src/MQTTClient.h 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 --- a/MQTTClient-C/src/MQTTClient.h
+++ b/MQTTClient-C/src/MQTTClient.h +++ b/MQTTClient-C/src/MQTTClient.h
@@ -54,7 +54,13 @@ @@ -54,7 +54,13 @@
enum QoS { QOS0, QOS1, QOS2, SUBFAIL=0x80 }; enum QoS { QOS0, QOS1, QOS2, SUBFAIL=0x80 };
/* all failure return codes must be negative */ /* all failure return codes must be negative */
+#if defined(CPU_FAM_STM32L4) || defined(CPU_FAM_STM32L1) || defined(CPU_FAM_STM32WB) || defined(CPU_FAM_STM32G4) +#if !defined(CPU_LINE_STM32F030x4) && defined(CPU_STM32)
+/* the SUCCESS enum is also defined with stm32 L1, L4 and WB families. +/* the SUCCESS enum is defined for all stm32.
+ Since it contains the same value, we just skip its definition here for them. */ + Since it contains the same value, we just skip its definition here for them. */
+enum returnCode { BUFFER_OVERFLOW = -2, FAILURE = -1}; +enum returnCode { BUFFER_OVERFLOW = -2, FAILURE = -1};
+#else +#else