From 0d020b8298e74a466fda84048297a89b82987728 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Tue, 12 Dec 2017 18:51:13 -0500 Subject: [PATCH] headers/build: Use the system's types.h on Haiku. Technically a "hack" (but then again most of the config/build stuff is); as we need to use the system's config/types.h in order to get stdint definitions and the like. Previously there was a config_build directory which allowed the existence of two types.h -- the system one, and the headers/build one, but seeing as we only need this to provide Haiku-specific core types on other platforms, using the system's one should be fine. Our core type definitions have not changed in some time (and it's unclear when they would change aside from potential new platforms), breakage of the Haiku-on-Haiku build due to this should not happen often (if ever.) --- headers/build/config/types.h | 4 +++- headers/build/host/haiku_host/Errors.h | 1 - headers/build/host/haiku_host/config_build/HaikuConfig.h | 1 - headers/build/host/haiku_host/config_build/types.h | 1 - 4 files changed, 3 insertions(+), 4 deletions(-) delete mode 100644 headers/build/host/haiku_host/Errors.h delete mode 100644 headers/build/host/haiku_host/config_build/HaikuConfig.h delete mode 100644 headers/build/host/haiku_host/config_build/types.h diff --git a/headers/build/config/types.h b/headers/build/config/types.h index 7a05c18d87..260fbbc289 100644 --- a/headers/build/config/types.h +++ b/headers/build/config/types.h @@ -2,7 +2,9 @@ * Copyright 2009-2011, Haiku, Inc. All Rights Reserved. * Distributed under the terms of the MIT License. */ -#ifndef _CONFIG_BUILD_TYPES_H +#ifdef HAIKU_HOST_PLATFORM_HAIKU +#include_next +#elif !defined(_CONFIG_BUILD_TYPES_H) #define _CONFIG_BUILD_TYPES_H diff --git a/headers/build/host/haiku_host/Errors.h b/headers/build/host/haiku_host/Errors.h deleted file mode 100644 index a84a3087e5..0000000000 --- a/headers/build/host/haiku_host/Errors.h +++ /dev/null @@ -1 +0,0 @@ -#include "../os/support/Errors.h" diff --git a/headers/build/host/haiku_host/config_build/HaikuConfig.h b/headers/build/host/haiku_host/config_build/HaikuConfig.h deleted file mode 100644 index 723c2bb194..0000000000 --- a/headers/build/host/haiku_host/config_build/HaikuConfig.h +++ /dev/null @@ -1 +0,0 @@ -#include "/boot/system/develop/headers/config/HaikuConfig.h" diff --git a/headers/build/host/haiku_host/config_build/types.h b/headers/build/host/haiku_host/config_build/types.h deleted file mode 100644 index 423a4d9330..0000000000 --- a/headers/build/host/haiku_host/config_build/types.h +++ /dev/null @@ -1 +0,0 @@ -#include "/boot/system/develop/headers/config/types.h"