From a8d1c2dde9cc8849ca18ec2c66631c5166d779e8 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Sat, 14 Aug 2021 16:03:38 +0200 Subject: [PATCH] Kernel+LibC: Share definitions for sys/mman.h --- Kernel/API/POSIX/sys/mman.h | 39 ++++++++++++++++++++++++++++++ Kernel/UnixTypes.h | 18 ++------------ Userland/Libraries/LibC/sys/mman.h | 26 ++------------------ 3 files changed, 43 insertions(+), 40 deletions(-) create mode 100644 Kernel/API/POSIX/sys/mman.h diff --git a/Kernel/API/POSIX/sys/mman.h b/Kernel/API/POSIX/sys/mman.h new file mode 100644 index 0000000000..3c996e9699 --- /dev/null +++ b/Kernel/API/POSIX/sys/mman.h @@ -0,0 +1,39 @@ +/* + * Copyright (c) 2018-2021, Andreas Kling + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#pragma once + +#include +#include + +#ifdef __cplusplus +extern "C" { +#endif + +#define MAP_FILE 0x00 +#define MAP_SHARED 0x01 +#define MAP_PRIVATE 0x02 +#define MAP_FIXED 0x10 +#define MAP_ANONYMOUS 0x20 +#define MAP_ANON MAP_ANONYMOUS +#define MAP_STACK 0x40 +#define MAP_NORESERVE 0x80 +#define MAP_RANDOMIZED 0x100 +#define MAP_PURGEABLE 0x200 + +#define PROT_READ 0x1 +#define PROT_WRITE 0x2 +#define PROT_EXEC 0x4 +#define PROT_NONE 0x0 + +#define MAP_FAILED ((void*)-1) + +#define MADV_SET_VOLATILE 0x100 +#define MADV_SET_NONVOLATILE 0x200 + +#ifdef __cplusplus +} +#endif diff --git a/Kernel/UnixTypes.h b/Kernel/UnixTypes.h index 91db13321b..aa05951023 100644 --- a/Kernel/UnixTypes.h +++ b/Kernel/UnixTypes.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2020, Andreas Kling + * Copyright (c) 2018-2021, Andreas Kling * * SPDX-License-Identifier: BSD-2-Clause */ @@ -9,6 +9,7 @@ #include #include #include +#include #include #include @@ -73,21 +74,6 @@ enum { #define SEEK_CUR 1 #define SEEK_END 2 -#define MAP_SHARED 0x01 -#define MAP_PRIVATE 0x02 -#define MAP_FIXED 0x10 -#define MAP_ANONYMOUS 0x20 -#define MAP_ANON MAP_ANONYMOUS -#define MAP_STACK 0x40 -#define MAP_NORESERVE 0x80 -#define MAP_RANDOMIZED 0x100 -#define MAP_PURGEABLE 0x200 - -#define PROT_READ 0x1 -#define PROT_WRITE 0x2 -#define PROT_EXEC 0x4 -#define PROT_NONE 0x0 - #define MADV_SET_VOLATILE 0x100 #define MADV_SET_NONVOLATILE 0x200 diff --git a/Userland/Libraries/LibC/sys/mman.h b/Userland/Libraries/LibC/sys/mman.h index 960c84d533..2f694ff541 100644 --- a/Userland/Libraries/LibC/sys/mman.h +++ b/Userland/Libraries/LibC/sys/mman.h @@ -1,34 +1,12 @@ /* - * Copyright (c) 2018-2020, Andreas Kling + * Copyright (c) 2018-2021, Andreas Kling * * SPDX-License-Identifier: BSD-2-Clause */ #pragma once -#include -#include - -#define MAP_FILE 0x00 -#define MAP_SHARED 0x01 -#define MAP_PRIVATE 0x02 -#define MAP_FIXED 0x10 -#define MAP_ANONYMOUS 0x20 -#define MAP_ANON MAP_ANONYMOUS -#define MAP_STACK 0x40 -#define MAP_NORESERVE 0x80 -#define MAP_RANDOMIZED 0x100 -#define MAP_PURGEABLE 0x200 - -#define PROT_READ 0x1 -#define PROT_WRITE 0x2 -#define PROT_EXEC 0x4 -#define PROT_NONE 0x0 - -#define MAP_FAILED ((void*)-1) - -#define MADV_SET_VOLATILE 0x100 -#define MADV_SET_NONVOLATILE 0x200 +#include __BEGIN_DECLS