Skip to content

Commit f18af66

Browse files
ycsinMaureenHelm
authored andcommitted
include: optimize the order of includes for x86
x86 32bit defines `CONFIG_X86` while its 64bit counterpart defines an additional `CONFIG_X86_64`, by reordering the include order we can make it look a bit cleaner. Signed-off-by: Yong Cong Sin <[email protected]>
1 parent 3fc0e02 commit f18af66

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

include/zephyr/arch/arch_inlines.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#ifndef ZEPHYR_INCLUDE_ARCH_INLINES_H_
1313
#define ZEPHYR_INCLUDE_ARCH_INLINES_H_
1414

15-
#if defined(CONFIG_X86) || defined(CONFIG_X86_64)
15+
#if defined(CONFIG_X86)
1616
#include <zephyr/arch/x86/arch_inlines.h>
1717
#elif defined(CONFIG_ARM)
1818
#include <zephyr/arch/arm/arch_inlines.h>

include/zephyr/arch/syscall.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,10 @@
99
#ifndef ZEPHYR_INCLUDE_ARCH_SYSCALL_H_
1010
#define ZEPHYR_INCLUDE_ARCH_SYSCALL_H_
1111

12-
#if defined(CONFIG_X86)
1312
#if defined(CONFIG_X86_64)
1413
#include <zephyr/arch/x86/intel64/syscall.h>
15-
#else
14+
#elif defined(CONFIG_X86)
1615
#include <zephyr/arch/x86/ia32/syscall.h>
17-
#endif
1816
#elif defined(CONFIG_ARM64)
1917
#include <zephyr/arch/arm64/syscall.h>
2018
#elif defined(CONFIG_ARM)

0 commit comments

Comments
 (0)