From fd09d924e66440a1c5d24d50f4bb12c89153e285 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Mon, 11 May 2026 14:17:55 -0400 Subject: [PATCH] headers: Drop nonstandard null.h and size_t.h. They're holdovers from R5. should just be included instead, and ssize_t declared directly in sys/types.h. --- headers/posix/locale.h | 3 ++- headers/posix/null.h | 12 ------------ headers/posix/size_t.h | 19 ------------------- headers/posix/stdio.h | 1 - headers/posix/stdlib.h | 2 +- headers/posix/sys/types.h | 19 +++++++++++-------- headers/posix/unistd.h | 1 - headers/private/file_systems/DebugSupport.h | 1 - headers/private/userlandfs/shared/Debug.h | 1 - .../file_systems/bfs/system_dependencies.h | 1 - .../kernel/file_systems/bindfs/DebugSupport.h | 1 - .../netfs/headers/shared/DebugSupport.h | 1 - .../kernel/file_systems/udf/UdfDebug.h | 1 - .../partitioning_systems/session/Debug.h | 1 - src/apps/icon-o-matic/generic/support/Debug.h | 1 - .../compat/openbsd_network/compat/sys/_null.h | 2 +- src/servers/package/DebugSupport.h | 1 - src/system/kernel/vm/PageCacheLocker.h | 2 +- 18 files changed, 16 insertions(+), 54 deletions(-) delete mode 100644 headers/posix/null.h delete mode 100644 headers/posix/size_t.h diff --git a/headers/posix/locale.h b/headers/posix/locale.h index 797e99f648..1f103c36ba 100644 --- a/headers/posix/locale.h +++ b/headers/posix/locale.h @@ -7,7 +7,8 @@ #include -#include +#include + struct lconv { char *decimal_point; diff --git a/headers/posix/null.h b/headers/posix/null.h deleted file mode 100644 index c74b189c9a..0000000000 --- a/headers/posix/null.h +++ /dev/null @@ -1,12 +0,0 @@ -/* - * Copyright 2008-2012 Haiku, Inc. All Rights Reserved. - * Distributed under the terms of the MIT License. - */ -#ifndef _NULL_H -#define _NULL_H - -#ifndef NULL - #define NULL 0 -#endif - -#endif diff --git a/headers/posix/size_t.h b/headers/posix/size_t.h deleted file mode 100644 index f8235c914f..0000000000 --- a/headers/posix/size_t.h +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright 2008-2012 Haiku, Inc. All Rights Reserved. - * Distributed under the terms of the MIT License. - */ -#ifndef _SIZE_T_H_ -#define _SIZE_T_H_ - - -#include - - -/* ATM we don't define ssize_t for GCC2 */ -#if __GNUC__ > 2 && !defined(__ssize_t__) -# define __ssize_t__ -typedef long signed int ssize_t; -#endif - - -#endif /* _SIZE_T_H_ */ diff --git a/headers/posix/stdio.h b/headers/posix/stdio.h index e0d395d218..16c9adb223 100644 --- a/headers/posix/stdio.h +++ b/headers/posix/stdio.h @@ -7,7 +7,6 @@ #include -#include #include diff --git a/headers/posix/stdlib.h b/headers/posix/stdlib.h index f187d1aed3..94357d6bcf 100644 --- a/headers/posix/stdlib.h +++ b/headers/posix/stdlib.h @@ -9,11 +9,11 @@ #include #include #include -#include #include #include #include + #define RAND_MAX 0x7fffffff #define MB_CUR_MAX (__ctype_get_mb_cur_max()) diff --git a/headers/posix/sys/types.h b/headers/posix/sys/types.h index 64d497eba9..6d71df9796 100644 --- a/headers/posix/sys/types.h +++ b/headers/posix/sys/types.h @@ -1,14 +1,14 @@ /* - * Copyright 2002-2012 Haiku, Inc. All Rights Reserved. + * Copyright 2002-2026, Haiku, Inc. All rights reserved. * Distributed under the terms of the MIT License. */ #ifndef _SYS_TYPES_H #define _SYS_TYPES_H -#include - #include +#include +#include /* BSD compatibility */ @@ -18,13 +18,18 @@ typedef unsigned short u_short; typedef unsigned char u_char; -/* sysV compatibility */ +/* SysV compatibility */ typedef unsigned long ulong; typedef unsigned short ushort; typedef unsigned int uint; typedef unsigned char unchar; +#if __GNUC__ > 2 && !defined(__ssize_t__) +#define __ssize_t__ +typedef long signed int ssize_t; +#endif + typedef __haiku_int64 blkcnt_t; typedef __haiku_std_int32 blksize_t; typedef __haiku_int64 fsblkcnt_t; @@ -43,9 +48,9 @@ typedef __haiku_std_uint32 umode_t; typedef __haiku_std_int32 nlink_t; #ifdef __HAIKU_BEOS_COMPATIBLE_TYPES - typedef int daddr_t; /* disk address */ +typedef int daddr_t; /* disk address */ #else - typedef off_t daddr_t; /* disk address */ +typedef off_t daddr_t; /* disk address */ #endif typedef char* caddr_t; @@ -122,8 +127,6 @@ struct _pthread_spinlock { }; -#include -#include #include #endif diff --git a/headers/posix/unistd.h b/headers/posix/unistd.h index 8128b5a357..5a2ef1a905 100644 --- a/headers/posix/unistd.h +++ b/headers/posix/unistd.h @@ -6,7 +6,6 @@ #define _UNISTD_H_ -#include #include #include diff --git a/headers/private/file_systems/DebugSupport.h b/headers/private/file_systems/DebugSupport.h index 7272bd46dc..685666420d 100644 --- a/headers/private/file_systems/DebugSupport.h +++ b/headers/private/file_systems/DebugSupport.h @@ -51,7 +51,6 @@ # endif #else # include -# include # if DEBUG_PRINT # define __out dbg_printf # define __outv dbg_vprintf diff --git a/headers/private/userlandfs/shared/Debug.h b/headers/private/userlandfs/shared/Debug.h index cda2ad704f..fa5a948233 100644 --- a/headers/private/userlandfs/shared/Debug.h +++ b/headers/private/userlandfs/shared/Debug.h @@ -44,7 +44,6 @@ # endif #else # include -# include # if DEBUG_PRINT # define __out dbg_printf # else diff --git a/src/add-ons/kernel/file_systems/bfs/system_dependencies.h b/src/add-ons/kernel/file_systems/bfs/system_dependencies.h index 115e940e31..4b636c7fea 100644 --- a/src/add-ons/kernel/file_systems/bfs/system_dependencies.h +++ b/src/add-ons/kernel/file_systems/bfs/system_dependencies.h @@ -42,7 +42,6 @@ #include #include #include -#include #include #include #include diff --git a/src/add-ons/kernel/file_systems/bindfs/DebugSupport.h b/src/add-ons/kernel/file_systems/bindfs/DebugSupport.h index 62ccd0da58..be53aadf8c 100644 --- a/src/add-ons/kernel/file_systems/bindfs/DebugSupport.h +++ b/src/add-ons/kernel/file_systems/bindfs/DebugSupport.h @@ -49,7 +49,6 @@ # endif #else # include -# include # if DEBUG_PRINT # define __out dbg_printf # else diff --git a/src/add-ons/kernel/file_systems/netfs/headers/shared/DebugSupport.h b/src/add-ons/kernel/file_systems/netfs/headers/shared/DebugSupport.h index de7832702a..c64febb152 100644 --- a/src/add-ons/kernel/file_systems/netfs/headers/shared/DebugSupport.h +++ b/src/add-ons/kernel/file_systems/netfs/headers/shared/DebugSupport.h @@ -49,7 +49,6 @@ # endif #else # include -# include # if DEBUG_PRINT # define __out dbg_printf # else diff --git a/src/add-ons/kernel/file_systems/udf/UdfDebug.h b/src/add-ons/kernel/file_systems/udf/UdfDebug.h index 5fc253b255..ffb8a920df 100644 --- a/src/add-ons/kernel/file_systems/udf/UdfDebug.h +++ b/src/add-ons/kernel/file_systems/udf/UdfDebug.h @@ -39,7 +39,6 @@ extern "C" int vsprintf(char *s, const char *format, va_list arg); //# include # define __out printf # else -//# include # define __out dprintf # endif # include diff --git a/src/add-ons/kernel/partitioning_systems/session/Debug.h b/src/add-ons/kernel/partitioning_systems/session/Debug.h index c37989f67e..49935594d2 100644 --- a/src/add-ons/kernel/partitioning_systems/session/Debug.h +++ b/src/add-ons/kernel/partitioning_systems/session/Debug.h @@ -35,7 +35,6 @@ # include # define __out printf # else -# include # define __out dprintf # endif #endif diff --git a/src/apps/icon-o-matic/generic/support/Debug.h b/src/apps/icon-o-matic/generic/support/Debug.h index 97237ada78..672da33207 100644 --- a/src/apps/icon-o-matic/generic/support/Debug.h +++ b/src/apps/icon-o-matic/generic/support/Debug.h @@ -51,7 +51,6 @@ # endif #else # include -# include # if DEBUG_PRINT # define __out dbg_printf # else diff --git a/src/libs/compat/openbsd_network/compat/sys/_null.h b/src/libs/compat/openbsd_network/compat/sys/_null.h index 11dd5e6b37..21aaf7436e 100644 --- a/src/libs/compat/openbsd_network/compat/sys/_null.h +++ b/src/libs/compat/openbsd_network/compat/sys/_null.h @@ -1 +1 @@ -#include +#include diff --git a/src/servers/package/DebugSupport.h b/src/servers/package/DebugSupport.h index 357ce6255a..57c898340f 100644 --- a/src/servers/package/DebugSupport.h +++ b/src/servers/package/DebugSupport.h @@ -53,7 +53,6 @@ # endif #else # include -# include # if DEBUG_PRINT # define __out dbg_printf # else diff --git a/src/system/kernel/vm/PageCacheLocker.h b/src/system/kernel/vm/PageCacheLocker.h index 36a21b2c7b..73b0807af7 100644 --- a/src/system/kernel/vm/PageCacheLocker.h +++ b/src/system/kernel/vm/PageCacheLocker.h @@ -6,7 +6,7 @@ #define PAGE_CACHE_LOCKER_H -#include +#include struct vm_page;