i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

headers: Move version constants to config/HaikuVersion.h.

Browse Source 
They have been in BeBuild.h since BeOS days, but as this file
is included everywhere in the base system headers, it causes
a bunch of unnecessary POSIX namespace pollution. So, instead,
put them in a config header, and include it from SupportDefs.h,
which should only ever be included by Be/Haiku API headers.
This commit is contained in:
Augustin Cavalier
2026-05-11 14:08:18 -04:00
parent 414c41e7bf
commit 60d0411454
4 changed files with 89 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/os/BeBuild.h
+2 -75
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2007-2024, Haiku, Inc. All Rights Reserved.
* Copyright 2007-2026, Haiku, Inc. All rights reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _BE_BUILD_H
@@ -9,79 +9,6 @@
#include <config/HaikuConfig.h>
#define B_BEOS_VERSION_4 0x0400
#define B_BEOS_VERSION_4_5 0x0450
#define B_BEOS_VERSION_5 0x0500
#define B_BEOS_VERSION B_BEOS_VERSION_5
#define B_BEOS_VERSION_MAUI B_BEOS_VERSION_5
/* Haiku (API) version */
#define B_HAIKU_VERSION_BEOS 0x00000001
#define B_HAIKU_VERSION_BONE 0x00000002
#define B_HAIKU_VERSION_DANO 0x00000003
#define B_HAIKU_VERSION_1_ALPHA_1 0x00000100
#define B_HAIKU_VERSION_1_PRE_ALPHA_2 0x00000101
#define B_HAIKU_VERSION_1_ALPHA_2 0x00000200
#define B_HAIKU_VERSION_1_PRE_ALPHA_3 0x00000201
#define B_HAIKU_VERSION_1_ALPHA_3 0x00000300
#define B_HAIKU_VERSION_1_PRE_ALPHA_4 0x00000301
#define B_HAIKU_VERSION_1_ALPHA_4 0x00000400
#define B_HAIKU_VERSION_1_PRE_BETA_1 0x00000401
#define B_HAIKU_VERSION_1_BETA_1 0x00000500
#define B_HAIKU_VERSION_1_PRE_BETA_2 0x00000501
#define B_HAIKU_VERSION_1_BETA_2 0x00000600
#define B_HAIKU_VERSION_1_PRE_BETA_3 0x00000601
#define B_HAIKU_VERSION_1_BETA_3 0x00000700
#define B_HAIKU_VERSION_1_PRE_BETA_4 0x00000701
#define B_HAIKU_VERSION_1_BETA_4 0x00000800
#define B_HAIKU_VERSION_1_PRE_BETA_5 0x00000801
#define B_HAIKU_VERSION_1_BETA_5 0x00000900
#define B_HAIKU_VERSION_1_PRE_BETA_6 0x00000901
#define B_HAIKU_VERSION_1 0x00010000
#define B_HAIKU_VERSION B_HAIKU_VERSION_1_PRE_BETA_6
/* Haiku ABI */
#define B_HAIKU_ABI_MAJOR 0xffff0000
#define B_HAIKU_ABI_GCC_2 0x00020000
#define B_HAIKU_ABI_GCC_4 0x00040000
#define B_HAIKU_ABI_GCC_2_ANCIENT 0x00020000
#define B_HAIKU_ABI_GCC_2_BEOS 0x00020001
#define B_HAIKU_ABI_GCC_2_HAIKU 0x00020002
#define B_HAIKU_ABI_NAME __HAIKU_ARCH_ABI
#if __GNUC__ == 2
# define B_HAIKU_ABI B_HAIKU_ABI_GCC_2_HAIKU
#elif (__GNUC__ >= 4 && __GNUC__ <= 15) || defined(__TINYC__)
# define B_HAIKU_ABI B_HAIKU_ABI_GCC_4
#else
# error Unsupported compiler!
#endif
#define B_HAIKU_BITS __HAIKU_ARCH_BITS
#define B_HAIKU_PHYSICAL_BITS __HAIKU_ARCH_PHYSICAL_BITS
#ifdef __HAIKU_ARCH_64_BIT
# define B_HAIKU_64_BIT 1
#else
# define B_HAIKU_32_BIT 1
#endif
#ifdef __HAIKU_ARCH_PHYSICAL_64_BIT
# define B_HAIKU_PHYSICAL_64_BIT 1
#else
# define B_HAIKU_PHYSICAL_32_BIT 1
#endif
#ifdef __HAIKU_BEOS_COMPATIBLE
# define B_HAIKU_BEOS_COMPATIBLE 1
#endif
#define _UNUSED(argument) argument
#define _PACKED __attribute__((packed))
#define _PRINTFLIKE(_format_, _args_) \
@@ -102,10 +29,10 @@
#define __has_builtin(x) 0
#endif
#define B_DEFINE_SYMBOL_VERSION(function, versionedSymbol) \
__asm__(".symver " function "," versionedSymbol)
#ifdef __cplusplus
# define B_DEFINE_WEAK_ALIAS(name, alias_name) \
extern "C" __typeof(name) alias_name __attribute__((weak, alias(#name)))
headers/os/support/SupportDefs.h
+1
View File
@@ -11,6 +11,7 @@
#include <BeBuild.h>
#include <Errors.h>
#include <config/HaikuVersion.h>
#include <inttypes.h>
#include <sys/types.h>