Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-07 09:18:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

libc: Move queue.h from include to include/nuttx

Browse Source 
to avoid the conflict with libuv's queue.h

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao
2022-09-25 23:08:38 +08:00
committed by Petro Karashchenko
parent 8b3a936588
commit 40ef5bc6db
158 changed files with 150 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/nuttx/audio/audio.h
+1 -2
View File
@@ -44,8 +44,7 @@
#include <nuttx/fs/ioctl.h>
#include <nuttx/semaphore.h>
#include <nuttx/spi/spi.h>
#include <queue.h>
#include <nuttx/queue.h>
#ifdef CONFIG_AUDIO
include/nuttx/can.h
+1 -1
View File
@@ -31,7 +31,7 @@
# include <nuttx/wqueue.h>
#endif
#include <queue.h>
#include <nuttx/queue.h>
#ifdef CONFIG_NET_CAN
include/nuttx/mm/mempool.h
+1 -1
View File
@@ -25,9 +25,9 @@
* Included Files
****************************************************************************/
#include <queue.h>
#include <sys/types.h>
#include <nuttx/queue.h>
#include <nuttx/fs/procfs.h>
#include <nuttx/spinlock.h>
#include <nuttx/semaphore.h>
include/nuttx/modem/altmdm.h
+1 -2
View File
@@ -28,8 +28,7 @@
#include <nuttx/config.h>
#include <nuttx/fs/ioctl.h>
#include <nuttx/spi/spi.h>
#include <queue.h>
#include <debug.h>
#include <nuttx/queue.h>
#include <nuttx/irq.h>
/****************************************************************************
include/nuttx/mqueue.h
-1
View File
@@ -35,7 +35,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <mqueue.h>
#include <queue.h>
#include <poll.h>
#if CONFIG_MQ_MAXMSGSIZE > 0
include/nuttx/net/mld.h
+1 -1
View File
@@ -28,8 +28,8 @@
#include <nuttx/config.h>
#include <stdint.h>
#include <queue.h>
#include <nuttx/queue.h>
#include <nuttx/wdog.h>
#include <nuttx/net/ip.h>
#include <nuttx/net/icmpv6.h>
include/nuttx/net/net.h
+1 -1
View File
@@ -33,8 +33,8 @@
#include <stdbool.h>
#include <stdarg.h>
#include <semaphore.h>
#include <queue.h>
#include <nuttx/queue.h>
#ifdef CONFIG_MM_IOB
# include <nuttx/mm/iob.h>
#endif
include/nuttx/net/netdev.h
+2 -1
View File
@@ -52,7 +52,8 @@
#include <sys/ioctl.h>
#include <stdint.h>
#include <queue.h>
#include <nuttx/queue.h>
#include <net/if.h>
#include <net/ethernet.h>
include/nuttx/net/netlink.h
+1 -1
View File
@@ -27,7 +27,7 @@
#include <nuttx/config.h>
#include <queue.h>
#include <nuttx/queue.h>
#include <netpacket/netlink.h>
include/nuttx/power/pm.h
+2 -1
View File
@@ -54,11 +54,12 @@
****************************************************************************/
#include <nuttx/config.h>
#include <nuttx/queue.h>
#include <nuttx/wdog.h>
#include <stdbool.h>
#include <time.h>
#include <queue.h>
#ifdef CONFIG_PM
include/queue.h → include/nuttx/queue.h
+4 -4
View File
@@ -1,5 +1,5 @@
/****************************************************************************
* include/queue.h
* include/nuttx/queue.h
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -18,8 +18,8 @@
*
****************************************************************************/
#ifndef __INCLUDE_QUEUE_H
#define __INCLUDE_QUEUE_H
#ifndef __INCLUDE_NUTTX_QUEUE_H
#define __INCLUDE_NUTTX_QUEUE_H
/****************************************************************************
* Included Files
@@ -329,4 +329,4 @@ size_t dq_count(FAR dq_queue_t *queue);
}
#endif
#endif /* __INCLUDE_QUEUE_H_ */
#endif /* __INCLUDE_NUTTX_QUEUE_H_ */
include/nuttx/sched.h
+1 -1
View File
@@ -29,7 +29,6 @@
#include <sys/types.h>
#include <stdint.h>
#include <queue.h>
#include <sched.h>
#include <signal.h>
#include <semaphore.h>
@@ -38,6 +37,7 @@
#include <nuttx/clock.h>
#include <nuttx/irq.h>
#include <nuttx/queue.h>
#include <nuttx/wdog.h>
#include <nuttx/mm/shm.h>
#include <nuttx/fs/fs.h>
include/nuttx/wdog.h
-1
View File
@@ -29,7 +29,6 @@
#include <nuttx/clock.h>
#include <stdint.h>
#include <queue.h>
/****************************************************************************
* Pre-processor Definitions
include/nuttx/wqueue.h
+1 -1
View File
@@ -29,9 +29,9 @@
#include <sys/types.h>
#include <stdint.h>
#include <queue.h>
#include <nuttx/clock.h>
#include <nuttx/queue.h>
#include <nuttx/wdog.h>
/****************************************************************************
include/sched.h
-1
View File
@@ -32,7 +32,6 @@
#include <stdbool.h>
#include <strings.h>
#include <time.h>
#include "queue.h"
/********************************************************************************
* Pre-processor Definitions