Submodule macro utils

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "deps/c-utility"]
 	path = deps/c-utility
 	url = https://github.com/Azure/azure-c-shared-utility.git
+[submodule "deps/azure-macro-utils-c"]
+	path = deps/azure-macro-utils-c
+	url = https://github.com/Azure/azure-macro-utils-c.git

CMakeLists.txt

@@ -45,6 +45,13 @@ set(run_unittests OFF)
 
 include("dependencies.cmake")
 
+if(NOT ${use_installed_dependencies})
+    if ((NOT TARGET azure_macro_utils_c) AND (EXISTS ${CMAKE_CURRENT_LIST_DIR}/deps/azure-macro-utils-c/CMakeLists.txt))
+        add_subdirectory(deps/azure-macro-utils-c)
+        include_directories(deps/azure-macro-utils-c/inc)
+    endif()
+endif()
+
 if (${original_run_e2e_tests} OR ${original_run_unittests})
     set(SHARED_UTIL_REAL_TEST_FOLDER ${CMAKE_CURRENT_LIST_DIR}/deps/c-utility/tests/real_test_files CACHE INTERNAL "this is what needs to be included when doing test sources" FORCE)
     add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/deps/c-utility/testtools)

deps/azure-macro-utils-c

@@ -0,0 +1 @@
+Subproject commit d0f4a05610537570380fc901adadfe6971c30376

deps/c-utility

@@ -1 +1 @@
-Subproject commit 10136150741c622eb5b6e96149ae370c5f89554d
+Subproject commit 2bbeae0ee35eea3531a469afaad82e5b3f2b18dc

inc/azure_umqtt_c/mqtt_client.h

@@ -5,7 +5,7 @@
 #define MQTT_CLIENT_H
 
 #include "azure_c_shared_utility/xio.h"
-#include "azure_c_shared_utility/macro_utils.h"
+#include "azure_macro_utils/macro_utils.h"
 #include "azure_umqtt_c/mqttconst.h"
 #include "azure_umqtt_c/mqtt_message.h"
 #include "azure_c_shared_utility/umock_c_prod.h"

inc/azure_umqtt_c/mqttconst.h

@@ -5,7 +5,7 @@
 #define MQTTCONST_H
 
 #include "azure_c_shared_utility/crt_abstractions.h"
-#include "azure_c_shared_utility/macro_utils.h"
+#include "azure_macro_utils/macro_utils.h"
 
 #ifdef __cplusplus
 #include <cstddef>

src/mqtt_client.c

@@ -7,13 +7,12 @@
 #include "azure_c_shared_utility/crt_abstractions.h"
 #include "azure_c_shared_utility/gballoc.h"
 #include "azure_c_shared_utility/optimize_size.h"
-#include "azure_c_shared_utility/macro_utils.h"
+#include "azure_macro_utils/macro_utils.h"
 #include "azure_c_shared_utility/platform.h"
 #include "azure_c_shared_utility/strings.h"
 #include "azure_c_shared_utility/threadapi.h"
 #include "azure_c_shared_utility/tickcounter.h"
 #include "azure_c_shared_utility/xlogging.h"
-#include "azure_c_shared_utility/macro_utils.h"
 
 #include "azure_umqtt_c/mqtt_client.h"
 #include "azure_umqtt_c/mqtt_codec.h"

src/mqtt_codec.c

@@ -7,7 +7,7 @@
 #include "azure_c_shared_utility/gballoc.h"
 #include "azure_c_shared_utility/buffer_.h"
 #include "azure_c_shared_utility/strings.h"
-#include "azure_c_shared_utility/macro_utils.h"
+#include "azure_macro_utils/macro_utils.h"
 #include "azure_c_shared_utility/xlogging.h"
 #include "azure_umqtt_c/mqtt_codec.h"
 #include <inttypes.h>

src/mqtt_message.c

@@ -7,7 +7,7 @@
 #include "azure_c_shared_utility/gballoc.h"
 #include "azure_c_shared_utility/xlogging.h"
 #include "azure_c_shared_utility/string_token.h"
-#include "azure_c_shared_utility/macro_utils.h"
+#include "azure_macro_utils/macro_utils.h"
 
 typedef struct MQTT_MESSAGE_TAG
 {