From b28ed9e04a771e5de38be68abd08148c0bbafc56 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Tue, 24 Sep 2024 12:10:35 -0400 Subject: [PATCH] HaikuConfig: Don't define __HAIKU_BEOS_COMPATIBLE_TYPES in kernel mode. This breaks kernel C++ ABI. This mostly just changes the definition (not the size) of string types, but in at least one case (daddr_t) it does change the size (from 32- to 64-bit.) --- headers/config/HaikuConfig.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/headers/config/HaikuConfig.h b/headers/config/HaikuConfig.h index eecbda7dd0..ffeec8ea71 100644 --- a/headers/config/HaikuConfig.h +++ b/headers/config/HaikuConfig.h @@ -139,7 +139,7 @@ #endif /* BeOS R5 compatible types */ -#if defined(__HAIKU_ARCH_X86) +#if defined(__HAIKU_ARCH_X86) && !defined(_KERNEL_MODE) /* TODO: This should be "#ifdef __HAIKU_BEOS_COMPATIBLE", but this will break all gcc 4 C++ optional packages. I.e. switch that at a suitable time.