Diff: azure_umqtt_c/mqttconst.h

Revision:

2:f3140ae5c35c

Parent:

0:ef4901974abc

Child:

5:34779607059c

--- a/azure_umqtt_c/mqttconst.h	Sun Apr 24 16:40:45 2016 -0700
+++ b/azure_umqtt_c/mqttconst.h	Mon May 09 14:37:25 2016 -0700
@@ -15,33 +15,33 @@
 
 #include "azure_c_shared_utility/crt_abstractions.h"
 
-typedef enum CONTROL_PACKET_TYPE_TAG
-{
-    CONNECT_TYPE = 0x10,
-    CONNACK_TYPE = 0x20,
-    PUBLISH_TYPE = 0x30,
-    PUBACK_TYPE = 0x40,
-    PUBREC_TYPE = 0x50,
-    PUBREL_TYPE = 0x60,
-    PUBCOMP_TYPE = 0x70,
-    SUBSCRIBE_TYPE = 0x80,
-    SUBACK_TYPE = 0x90,
-    UNSUBSCRIBE_TYPE = 0xA0,
-    UNSUBACK_TYPE = 0xB0,
-    PINGREQ_TYPE = 0xC0,
-    PINGRESP_TYPE = 0xD0,
-    DISCONNECT_TYPE = 0xE0,
-    PACKET_TYPE_ERROR,
+#define CONTROL_PACKET_TYPE_VALUES \
+    CONNECT_TYPE = 0x10, \
+    CONNACK_TYPE = 0x20, \
+    PUBLISH_TYPE = 0x30, \
+    PUBACK_TYPE = 0x40, \
+    PUBREC_TYPE = 0x50, \
+    PUBREL_TYPE = 0x60, \
+    PUBCOMP_TYPE = 0x70, \
+    SUBSCRIBE_TYPE = 0x80, \
+    SUBACK_TYPE = 0x90, \
+    UNSUBSCRIBE_TYPE = 0xA0, \
+    UNSUBACK_TYPE = 0xB0, \
+    PINGREQ_TYPE = 0xC0, \
+    PINGRESP_TYPE = 0xD0, \
+    DISCONNECT_TYPE = 0xE0, \
+    PACKET_TYPE_ERROR, \
     UNKNOWN_TYPE
-} CONTROL_PACKET_TYPE;
+
+DEFINE_ENUM(CONTROL_PACKET_TYPE, CONTROL_PACKET_TYPE_VALUES)
 
-typedef enum QOS_VALUE_TAG
-{
-    DELIVER_AT_MOST_ONCE = 0x00,
-    DELIVER_AT_LEAST_ONCE = 0x01,
-    DELIVER_EXACTLY_ONCE = 0x02,
+#define QOS_VALUE_VALUES \
+    DELIVER_AT_MOST_ONCE = 0x00, \
+    DELIVER_AT_LEAST_ONCE = 0x01, \
+    DELIVER_EXACTLY_ONCE = 0x02, \
     DELIVER_FAILURE = 0x80
-} QOS_VALUE;
+
+DEFINE_ENUM(QOS_VALUE, QOS_VALUE_VALUES)
 
 typedef struct APP_PAYLOAD_TAG
 {