vaious: Fix toolchain include path

Zephyr now requires that the generic toolchain include is used instead of toolchain-specific includes, this updates libs and tests to use the updated path Signed-off-by: Jamie McCrae <[email protected]>
adsz-nordic · Jan 10, 2024 · cc71dc4 · cc71dc4
1 parent 3b41290
commit cc71dc4
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/lib/at_cmd_custom/at_cmd_custom.c b/lib/at_cmd_custom/at_cmd_custom.c
@@ -9,7 +9,7 @@
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdio.h>
-#include <zephyr/toolchain/common.h>
+#include <zephyr/toolchain.h>
 #include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/init.h>

diff --git a/lib/at_monitor/at_monitor.c b/lib/at_monitor/at_monitor.c
@@ -10,7 +10,7 @@
 #include <zephyr/device.h>
 #include <nrf_modem_at.h>
 #include <modem/at_monitor.h>
-#include <zephyr/toolchain/common.h>
+#include <zephyr/toolchain.h>
 #include <zephyr/logging/log.h>
 
 LOG_MODULE_REGISTER(at_monitor, CONFIG_AT_MONITOR_LOG_LEVEL);

diff --git a/lib/nrf_modem_lib/nrf_modem_lib.c b/lib/nrf_modem_lib/nrf_modem_lib.c
@@ -11,7 +11,7 @@
 #include <zephyr/device.h>
 #include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
-#include <zephyr/toolchain/common.h>
+#include <zephyr/toolchain.h>
 #include <modem/nrf_modem_lib.h>
 #include <modem/nrf_modem_lib_trace.h>
 #include <pm_config.h>

diff --git a/subsys/bluetooth/mesh/sensor_types.c b/subsys/bluetooth/mesh/sensor_types.c
@@ -8,7 +8,7 @@
 #include <stdio.h>
 #include "sensor.h"
 #include <zephyr/sys/byteorder.h>
-#include <zephyr/toolchain/common.h>
+#include <zephyr/toolchain.h>
 #include <bluetooth/mesh/properties.h>
 #include <bluetooth/mesh/sensor_types.h>
 

diff --git a/subsys/net/lib/download_client/src/download_client.c b/subsys/net/lib/download_client/src/download_client.c
@@ -8,7 +8,7 @@
 #include <string.h>
 #include <zephyr/kernel.h>
 #include <zephyr/types.h>
-#include <zephyr/toolchain/common.h>
+#include <zephyr/toolchain.h>
 #if defined(CONFIG_POSIX_API)
 #include <zephyr/posix/unistd.h>
 #include <zephyr/posix/netdb.h>

diff --git a/subsys/net/lib/icalendar_parser/src/icalendar_parser.c b/subsys/net/lib/icalendar_parser/src/icalendar_parser.c
@@ -8,7 +8,7 @@
 #include <strings.h>
 #include <zephyr/kernel.h>
 #include <zephyr/types.h>
-#include <zephyr/toolchain/common.h>
+#include <zephyr/toolchain.h>
 #include <net/icalendar_parser.h>
 #include <zephyr/logging/log.h>
 

diff --git a/tests/lib/nrf_modem_lib/nrf_modem_lib_trace/src/main.c b/tests/lib/nrf_modem_lib/nrf_modem_lib_trace/src/main.c
@@ -6,7 +6,7 @@
 
 #include <string.h>
 #include <unity.h>
-#include <zephyr/toolchain/common.h>
+#include <zephyr/toolchain.h>
 #include <zephyr/logging/log.h>
 #include <zephyr/fff.h>
 #include <syscalls/random.h>