[haiku-commits] haiku: hrev51671 - in headers/build: config host/haiku_host/config_build host/haiku_host

  • From: waddlesplash@xxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Wed, 13 Dec 2017 00:55:13 +0100 (CET)

hrev51671 adds 1 changeset to branch 'master'
old head: 02c9c92ae27a71f8e8d6dad25388b0f8a3292255
new head: 0d020b8298e74a466fda84048297a89b82987728
overview: 
http://cgit.haiku-os.org/haiku/log/?qt=range&q=0d020b8298e7+%5E02c9c92ae27a

----------------------------------------------------------------------------

0d020b8298e7: 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.)

                              [ Augustin Cavalier <waddlesplash@xxxxxxxxx> ]

----------------------------------------------------------------------------

Revision:    hrev51671
Commit:      0d020b8298e74a466fda84048297a89b82987728
URL:         http://cgit.haiku-os.org/haiku/commit/?id=0d020b8298e7
Author:      Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date:        Tue Dec 12 23:51:13 2017 UTC

----------------------------------------------------------------------------

4 files changed, 3 insertions(+), 4 deletions(-)
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 -

----------------------------------------------------------------------------

diff --git a/headers/build/config/types.h b/headers/build/config/types.h
index 7a05c18..260fbbc 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 <config/types.h>
+#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 a84a308..0000000
--- 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 723c2bb..0000000
--- 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 423a4d9..0000000
--- a/headers/build/host/haiku_host/config_build/types.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "/boot/system/develop/headers/config/types.h"


Other related posts: