[PATCH liburing v4 04/10] arch: Remove `__INTERNAL__LIBURING_LIB_H` checks

Ammar Faizi
2022-07-04T19:32:33Z

We will include the syscall.h from another place as well. This check
was added by me when adding the x86 syscalls. For aarch64 we will
include this header from lib.h but we are restricted by this check.
Let's just remove it for all archs. User shouldn't touch this code
directly anyway.

Signed-off-by: Ammar Faizi <ammarfaizi2@gnuweeb.org>
---
src/arch/aarch64/syscall.h | 4 ----
src/arch/generic/lib.h | 4 ----
src/arch/generic/syscall.h | 4 ----
src/arch/x86/lib.h | 4 ----
src/arch/x86/syscall.h | 4 ----
src/lib.h | 2 --
src/syscall.h | 2 --
7 files changed, 24 deletions(-)

diff --git a/src/arch/aarch64/syscall.h b/src/arch/aarch64/syscall.h
index c0ab7e2..b00e90b 100644
--- a/src/arch/aarch64/syscall.h
+++ b/src/arch/aarch64/syscall.h
@@ -1,9 +1,5 @@
/* SPDX-License-Identifier: MIT */

-#ifndef __INTERNAL__LIBURING_SYSCALL_H
- #error "This file should be included from src/syscall.h (liburing)"
-#endif
-
#ifndef LIBURING_ARCH_AARCH64_SYSCALL_H
#define LIBURING_ARCH_AARCH64_SYSCALL_H

diff --git a/src/arch/generic/lib.h b/src/arch/generic/lib.h
index 737e795..6b006c6 100644
--- a/src/arch/generic/lib.h
+++ b/src/arch/generic/lib.h
@@ -1,9 +1,5 @@
/* SPDX-License-Identifier: MIT */

-#ifndef __INTERNAL__LIBURING_LIB_H
- #error "This file should be included from src/lib.h (liburing)"
-#endif
-
#ifndef LIBURING_ARCH_GENERIC_LIB_H
#define LIBURING_ARCH_GENERIC_LIB_H

diff --git a/src/arch/generic/syscall.h b/src/arch/generic/syscall.h
index 22252a1..e637890 100644
--- a/src/arch/generic/syscall.h
+++ b/src/arch/generic/syscall.h
@@ -1,9 +1,5 @@
/* SPDX-License-Identifier: MIT */

-#ifndef __INTERNAL__LIBURING_SYSCALL_H
- #error "This file should be included from src/syscall.h (liburing)"
-#endif
-
#ifndef LIBURING_ARCH_GENERIC_SYSCALL_H
#define LIBURING_ARCH_GENERIC_SYSCALL_H

diff --git a/src/arch/x86/lib.h b/src/arch/x86/lib.h
index e6a74f3..6ece2d4 100644
--- a/src/arch/x86/lib.h
+++ b/src/arch/x86/lib.h
@@ -1,9 +1,5 @@
/* SPDX-License-Identifier: MIT */

-#ifndef __INTERNAL__LIBURING_LIB_H
- #error "This file should be included from src/lib.h (liburing)"
-#endif
-
#ifndef LIBURING_ARCH_X86_LIB_H
#define LIBURING_ARCH_X86_LIB_H

diff --git a/src/arch/x86/syscall.h b/src/arch/x86/syscall.h
index 43c576b..cb8fb91 100644
--- a/src/arch/x86/syscall.h
+++ b/src/arch/x86/syscall.h
@@ -1,9 +1,5 @@
/* SPDX-License-Identifier: MIT */

-#ifndef __INTERNAL__LIBURING_SYSCALL_H
- #error "This file should be included from src/syscall.h (liburing)"
-#endif
-
#ifndef LIBURING_ARCH_X86_SYSCALL_H
#define LIBURING_ARCH_X86_SYSCALL_H

diff --git a/src/lib.h b/src/lib.h
index 89a40f2..7bbacb9 100644
--- a/src/lib.h
+++ b/src/lib.h
@@ -6,7 +6,6 @@
#include <string.h>
#include <unistd.h>

-#define __INTERNAL__LIBURING_LIB_H
#if defined(__x86_64__) || defined(__i386__)
#include "arch/x86/lib.h"
#else
@@ -19,7 +18,6 @@
/* libc wrappers. */
#include "arch/generic/lib.h"
#endif
-#undef __INTERNAL__LIBURING_LIB_H

#ifndef offsetof
diff --git a/src/syscall.h b/src/syscall.h
index 214789d..73b04b4 100644
--- a/src/syscall.h
+++ b/src/syscall.h
@@ -70,7 +70,6 @@ static inline bool IS_ERR(const void *ptr)
return uring_unlikely((uintptr_t) ptr >= (uintptr_t) -4095UL);
}

-#define __INTERNAL__LIBURING_SYSCALL_H
#if defined(__x86_64__) || defined(__i386__)
#include "arch/x86/syscall.h"
#elif defined(__aarch64__)
@@ -86,7 +85,6 @@ static inline bool IS_ERR(const void *ptr)
/* libc syscall wrappers. */
#include "arch/generic/syscall.h"
#endif
-#undef __INTERNAL__LIBURING_SYSCALL_H

/*
* For backward compatibility.
--
Ammar Faizi