From 92b1a6ea8a11f4839cc36660657a92633bd2b739 Mon Sep 17 00:00:00 2001 From: Pepper Gray Date: Sat, 2 May 2026 15:30:24 +0200 Subject: [PATCH] use to enhance portability (clang) using and simultaneously causes clang to fail: ``` In file included from FEX/FEXCore/Source/Utils/AllocatorHooks.cpp:6: /usr/include/sys/prctl.h:88:8: error: redefinition of 'prctl_mm_map' 88 | struct prctl_mm_map { | ^ /usr/include/linux/prctl.h:134:8: note: previous definition is here 134 | struct prctl_mm_map { | ^ 1 error generated. ``` prefer and do not include fix: #5454 Signed-off-by: Pepper Gray --- FEXCore/Source/Interface/Core/CPUBackend.cpp | 1 - FEXCore/Source/Utils/AllocatorHooks.cpp | 1 - FEXCore/include/FEXCore/Utils/PrctlUtils.h | 1 - Source/Tools/FEXInterpreter/ELFCodeLoader.h | 1 - 4 files changed, 4 deletions(-) diff --git a/FEXCore/Source/Interface/Core/CPUBackend.cpp b/FEXCore/Source/Interface/Core/CPUBackend.cpp index 20bfe22bc..1b1fc105d 100644 --- a/FEXCore/Source/Interface/Core/CPUBackend.cpp +++ b/FEXCore/Source/Interface/Core/CPUBackend.cpp @@ -12,7 +12,6 @@ #include #ifndef _WIN32 -#include #include #endif diff --git a/FEXCore/Source/Utils/AllocatorHooks.cpp b/FEXCore/Source/Utils/AllocatorHooks.cpp index f210375e1..fd6947fdf 100644 --- a/FEXCore/Source/Utils/AllocatorHooks.cpp +++ b/FEXCore/Source/Utils/AllocatorHooks.cpp @@ -2,7 +2,6 @@ #ifdef ENABLE_FEX_ALLOCATOR #include #ifndef _WIN32 -#include #include #include #else diff --git a/FEXCore/include/FEXCore/Utils/PrctlUtils.h b/FEXCore/include/FEXCore/Utils/PrctlUtils.h index 8e3629ee2..4494ce284 100644 --- a/FEXCore/include/FEXCore/Utils/PrctlUtils.h +++ b/FEXCore/include/FEXCore/Utils/PrctlUtils.h @@ -2,7 +2,6 @@ #pragma once #ifndef _WIN32 -#include #include #include #include diff --git a/Source/Tools/FEXInterpreter/ELFCodeLoader.h b/Source/Tools/FEXInterpreter/ELFCodeLoader.h index 99d92719c..b72c1660a 100644 --- a/Source/Tools/FEXInterpreter/ELFCodeLoader.h +++ b/Source/Tools/FEXInterpreter/ELFCodeLoader.h @@ -32,7 +32,6 @@ #include #include #include -#include #define PAGE_START(x) ((x) & ~(uintptr_t)(4095)) #define PAGE_OFFSET(x) ((x) & 4095)