From 39f92fa1313d7e6b1eb99dbd2f60996e0877b669 Mon Sep 17 00:00:00 2001 From: Andrew Kaster Date: Mon, 28 Feb 2022 18:52:04 -0700 Subject: [PATCH] LibC: Define offsetof in stddef.h instead of sys/cdefs.h Just like Dr. POSIX ordered. Move the macro where it belongs, but make sure it's visible to Userland files compiled with -DKERNEL. Parts of LibEDID that are compiled into the Kernel use offsetof to parse the EDID information given to us by hardware. --- Userland/Libraries/LibC/stddef.h | 2 ++ Userland/Libraries/LibC/sys/cdefs.h | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Userland/Libraries/LibC/stddef.h b/Userland/Libraries/LibC/stddef.h index bd4131a7f8d4db..49357f5c8b4742 100644 --- a/Userland/Libraries/LibC/stddef.h +++ b/Userland/Libraries/LibC/stddef.h @@ -6,6 +6,8 @@ #pragma once +#define offsetof(type, member) __builtin_offsetof(type, member) + #ifndef KERNEL # include diff --git a/Userland/Libraries/LibC/sys/cdefs.h b/Userland/Libraries/LibC/sys/cdefs.h index 00d6444102737c..e428ad6085abc9 100644 --- a/Userland/Libraries/LibC/sys/cdefs.h +++ b/Userland/Libraries/LibC/sys/cdefs.h @@ -22,5 +22,3 @@ #undef __P #define __P(a) a - -#define offsetof(type, member) __builtin_offsetof(type, member)