unified: rename sched.h to ksched.h
Build breaks when enabling CONFIG_NEWLIB_LIBC because it has its own sched.h file. This is a bad symptom of a greater issue: the build system passes many '-I<path>' options to the compiler, and that allows including header files by simply specifying their names (when located somewhere else than <zephyr>/include/) and can cause clashes when several files in different locations have the same name, like in this case. Fixes ZEP-1062. Change-Id: I81d1d69ee6669a609cd0c420b1b8f870d17dcb67 Signed-off-by: Benjamin Walsh <benjamin.walsh@windriver.com>
This commit is contained in:
parent
3751123fa9
commit
b4b108de4d
15 changed files with 17 additions and 17 deletions
|
@ -30,7 +30,7 @@
|
|||
#include <nano_private.h>
|
||||
#include <toolchain.h>
|
||||
#include <sections.h>
|
||||
#include <sched.h>
|
||||
#include <ksched.h>
|
||||
#include <wait_q.h>
|
||||
|
||||
extern void _k_thread_single_abort(struct tcs *thread);
|
||||
|
|
|
@ -27,7 +27,7 @@
|
|||
#include <toolchain.h>
|
||||
#include <sections.h>
|
||||
#include <wait_q.h>
|
||||
#include <sched.h>
|
||||
#include <ksched.h>
|
||||
#include <misc/slist.h>
|
||||
|
||||
void k_fifo_init(struct k_fifo *fifo)
|
||||
|
|
|
@ -14,8 +14,8 @@
|
|||
* limitations under the License.
|
||||
*/
|
||||
|
||||
#ifndef _sched__h_
|
||||
#define _sched__h_
|
||||
#ifndef _ksched__h_
|
||||
#define _ksched__h_
|
||||
|
||||
#include <kernel.h>
|
||||
#include <nano_private.h>
|
||||
|
@ -336,4 +336,4 @@ static inline void _unpend_thread(struct k_thread *thread)
|
|||
_mark_thread_as_not_pending(thread);
|
||||
}
|
||||
|
||||
#endif /* _sched__h_ */
|
||||
#endif /* _ksched__h_ */
|
|
@ -23,7 +23,7 @@
|
|||
|
||||
#ifdef CONFIG_KERNEL_V2
|
||||
#include <misc/dlist.h>
|
||||
#include <sched.h>
|
||||
#include <ksched.h>
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
|
|
@ -31,7 +31,7 @@
|
|||
#include <device.h>
|
||||
#include <init.h>
|
||||
#include <linker-defs.h>
|
||||
#include <sched.h>
|
||||
#include <ksched.h>
|
||||
|
||||
/* kernel build timestamp items */
|
||||
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
#include <toolchain.h>
|
||||
#include <sections.h>
|
||||
#include <wait_q.h>
|
||||
#include <sched.h>
|
||||
#include <ksched.h>
|
||||
|
||||
void k_lifo_init(struct k_lifo *lifo)
|
||||
{
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
#include <sections.h>
|
||||
#include <wait_q.h>
|
||||
#include <misc/dlist.h>
|
||||
#include <sched.h>
|
||||
#include <ksched.h>
|
||||
#include <init.h>
|
||||
|
||||
extern struct k_mem_map _k_mem_map_ptr_start[];
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
#include <kernel.h>
|
||||
#include <nano_private.h>
|
||||
#include <misc/debug/object_tracing_common.h>
|
||||
#include <sched.h>
|
||||
#include <ksched.h>
|
||||
#include <wait_q.h>
|
||||
#include <init.h>
|
||||
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
|
||||
#include <kernel.h>
|
||||
#include <nano_private.h>
|
||||
#include <sched.h>
|
||||
#include <ksched.h>
|
||||
#include <init.h>
|
||||
|
||||
struct offload_work {
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
#include <kernel.h>
|
||||
#include <nano_private.h>
|
||||
#include <atomic.h>
|
||||
#include <sched.h>
|
||||
#include <ksched.h>
|
||||
#include <wait_q.h>
|
||||
|
||||
/* set the bit corresponding to prio in ready q bitmap */
|
||||
|
|
|
@ -33,7 +33,7 @@
|
|||
#include <sections.h>
|
||||
#include <wait_q.h>
|
||||
#include <misc/dlist.h>
|
||||
#include <sched.h>
|
||||
#include <ksched.h>
|
||||
|
||||
#ifdef CONFIG_SEMAPHORE_GROUPS
|
||||
struct _sem_desc {
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
#include <misc/debug/object_tracing_common.h>
|
||||
#include <toolchain.h>
|
||||
#include <sections.h>
|
||||
#include <sched.h>
|
||||
#include <ksched.h>
|
||||
#include <wait_q.h>
|
||||
#include <misc/__assert.h>
|
||||
|
||||
|
|
|
@ -31,7 +31,7 @@
|
|||
#include <misc/printk.h>
|
||||
#include <sys_clock.h>
|
||||
#include <drivers/system_timer.h>
|
||||
#include <sched.h>
|
||||
#include <ksched.h>
|
||||
#include <wait_q.h>
|
||||
|
||||
extern struct _static_thread_data _k_task_list_start[];
|
||||
|
|
|
@ -27,7 +27,7 @@
|
|||
#include <toolchain.h>
|
||||
#include <sections.h>
|
||||
#include <wait_q.h>
|
||||
#include <sched.h>
|
||||
#include <ksched.h>
|
||||
|
||||
extern void _k_thread_single_abort(struct k_thread *thread);
|
||||
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
#include <nano_private.h>
|
||||
#include <misc/debug/object_tracing_common.h>
|
||||
#include <wait_q.h>
|
||||
#include <sched.h>
|
||||
#include <ksched.h>
|
||||
#include <init.h>
|
||||
|
||||
/**
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue