1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
|
# Changed 'bool' typedef to 'bit'
# Bug: 955115
# Upstream: https://github.com/eclipse-paho/paho.mqtt.c/commit/ff1d9229314079321272e521c165b18c92773c9f
--- a/src/MQTTPacket.h
+++ b/src/MQTTPacket.h
@@ -28,7 +28,7 @@
#include "LinkedList.h"
#include "Clients.h"
-typedef unsigned int bool;
+typedef unsigned int bit;
typedef void* (*pf)(int, unsigned char, char*, size_t);
#include "MQTTProperties.h"
@@ -67,16 +67,16 @@ typedef union
struct
{
unsigned int type : 4; /**< message type nibble */
- bool dup : 1; /**< DUP flag bit */
+ bit dup : 1; /**< DUP flag bit */
unsigned int qos : 2; /**< QoS value, 0, 1 or 2 */
- bool retain : 1; /**< retained flag bit */
+ bit retain : 1; /**< retained flag bit */
} bits;
#else
struct
{
- bool retain : 1; /**< retained flag bit */
+ bit retain : 1; /**< retained flag bit */
unsigned int qos : 2; /**< QoS value, 0, 1 or 2 */
- bool dup : 1; /**< DUP flag bit */
+ bit dup : 1; /**< DUP flag bit */
unsigned int type : 4; /**< message type nibble */
} bits;
#endif
@@ -95,24 +95,24 @@ typedef struct
#if defined(REVERSED)
struct
{
- bool username : 1; /**< 3.1 user name */
- bool password : 1; /**< 3.1 password */
- bool willRetain : 1; /**< will retain setting */
+ bit username : 1; /**< 3.1 user name */
+ bit password : 1; /**< 3.1 password */
+ bit willRetain : 1; /**< will retain setting */
unsigned int willQoS : 2; /**< will QoS value */
- bool will : 1; /**< will flag */
- bool cleanstart : 1; /**< cleansession flag */
+ bit will : 1; /**< will flag */
+ bit cleanstart : 1; /**< cleansession flag */
int : 1; /**< unused */
} bits;
#else
struct
{
int : 1; /**< unused */
- bool cleanstart : 1; /**< cleansession flag */
- bool will : 1; /**< will flag */
+ bit cleanstart : 1; /**< cleansession flag */
+ bit will : 1; /**< will flag */
unsigned int willQoS : 2; /**< will QoS value */
- bool willRetain : 1; /**< will retain setting */
- bool password : 1; /**< 3.1 password */
- bool username : 1; /**< 3.1 user name */
+ bit willRetain : 1; /**< will retain setting */
+ bit password : 1; /**< 3.1 password */
+ bit username : 1; /**< 3.1 user name */
} bits;
#endif
} flags; /**< connect flags byte */
@@ -140,12 +140,12 @@ typedef struct
struct
{
unsigned int reserved : 7; /**< message type nibble */
- bool sessionPresent : 1; /**< was a session found on the server? */
+ bit sessionPresent : 1; /**< was a session found on the server? */
} bits;
#else
struct
{
- bool sessionPresent : 1; /**< was a session found on the server? */
+ bit sessionPresent : 1; /**< was a session found on the server? */
unsigned int reserved : 7; /**< message type nibble */
} bits;
#endif
|
