Skip to content

Commit cbd31d7

Browse files
gmarullcarlescufi
authored andcommitted
lib: migrate includes to <zephyr/...>
In order to bring consistency in-tree, migrate all lib code to the new prefix <zephyr/...>. Note that the conversion has been scripted, refer to #45388 for more details. Signed-off-by: Gerard Marull-Paretas <[email protected]>
1 parent 741e838 commit cbd31d7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+199
-199
lines changed

lib/libc/arcmwdt/libc-hooks.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
*/
77

88
#include <stdio.h>
9-
#include <sys/libc-hooks.h>
10-
#include <syscall_handler.h>
9+
#include <zephyr/sys/libc-hooks.h>
10+
#include <zephyr/syscall_handler.h>
1111
#include <string.h>
12-
#include <sys/errno_private.h>
12+
#include <zephyr/sys/errno_private.h>
1313
#include <unistd.h>
1414
#include <errno.h>
1515

lib/libc/arcmwdt/threading.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66

77
#ifdef CONFIG_MULTITHREADING
88

9-
#include <init.h>
10-
#include <kernel.h>
11-
#include <sys/__assert.h>
12-
#include <sys/mutex.h>
13-
#include <logging/log.h>
9+
#include <zephyr/init.h>
10+
#include <zephyr/kernel.h>
11+
#include <zephyr/sys/__assert.h>
12+
#include <zephyr/sys/mutex.h>
13+
#include <zephyr/logging/log.h>
1414
#include <../lib/src/c/inc/internal/thread.h>
1515

1616
#ifndef CONFIG_USERSPACE

lib/libc/armstdc/include/errno.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
* @{
4040
*/
4141

42-
#include <sys/errno_private.h>
42+
#include <zephyr/sys/errno_private.h>
4343

4444
#ifdef __cplusplus
4545
extern "C" {

lib/libc/armstdc/src/libc-hooks.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* SPDX-License-Identifier: Apache-2.0
55
*/
66

7-
#include <kernel.h>
7+
#include <zephyr/kernel.h>
88
#include <stdio.h>
99

1010
static int _stdout_hook_default(int c)

lib/libc/armstdc/src/threading_weak.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* CONFIG_MULTITHREADING=n to ensure proper linking.
1818
*/
1919

20-
#include <kernel.h>
20+
#include <zephyr/kernel.h>
2121

2222
int __weak z_impl_k_mutex_init(struct k_mutex *mutex)
2323
{

lib/libc/minimal/include/assert.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#ifndef ZEPHYR_LIB_LIBC_MINIMAL_INCLUDE_ASSERT_H_
99
#define ZEPHYR_LIB_LIBC_MINIMAL_INCLUDE_ASSERT_H_
1010

11-
#include <sys/__assert.h>
11+
#include <zephyr/sys/__assert.h>
1212

1313
#ifdef __cplusplus
1414
extern "C" {

lib/libc/minimal/include/errno.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
* @{
3030
*/
3131

32-
#include <sys/errno_private.h>
32+
#include <zephyr/sys/errno_private.h>
3333

3434
#ifdef __cplusplus
3535
extern "C" {

lib/libc/minimal/include/stdio.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#ifndef ZEPHYR_LIB_LIBC_MINIMAL_INCLUDE_STDIO_H_
1010
#define ZEPHYR_LIB_LIBC_MINIMAL_INCLUDE_STDIO_H_
1111

12-
#include <toolchain.h>
12+
#include <zephyr/toolchain.h>
1313
#include <stdarg.h> /* Needed to get definition of va_list */
1414
#include <stddef.h>
1515

lib/libc/minimal/include/string.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#define ZEPHYR_LIB_LIBC_MINIMAL_INCLUDE_STRING_H_
1111

1212
#include <stddef.h>
13-
#include <toolchain.h>
13+
#include <zephyr/toolchain.h>
1414

1515
#ifdef __cplusplus
1616
extern "C" {

lib/libc/minimal/include/time.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#define ZEPHYR_LIB_LIBC_MINIMAL_INCLUDE_TIME_H_
1010

1111
#include <stdint.h>
12-
#include <toolchain.h>
12+
#include <zephyr/toolchain.h>
1313
#include <sys/_types.h>
1414
#include <sys/_timespec.h>
1515

0 commit comments

Comments
 (0)