Split parts of <features.h> into <sys/cdefs.h>.

libc/include/FILE.h

@@ -25,7 +25,7 @@
 #ifndef INCLUDE_FILE_H
 #define INCLUDE_FILE_H
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 #include <sys/__/types.h>
 

libc/include/__/byteswap.h

@@ -25,7 +25,7 @@
 #ifndef INCLUDE____BYTESWAP_H
 #define INCLUDE____BYTESWAP_H
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 __BEGIN_DECLS
 

libc/include/__/endian.h

@@ -25,7 +25,7 @@
 #ifndef INCLUDE____ENDIAN_H
 #define INCLUDE____ENDIAN_H
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 #include <__/byteswap.h>
 

libc/include/__/stdint.h

@@ -25,7 +25,7 @@
 #ifndef INCLUDE____STDINT_H
 #define INCLUDE____STDINT_H
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 #include <__/wordsize.h>
 

libc/include/alloca.h

@@ -25,7 +25,7 @@
 #ifndef INCLUDE_ALLOCA_H
 #define INCLUDE_ALLOCA_H
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 #include <sys/__/types.h>
 

libc/include/arpa/inet.h

@@ -25,7 +25,7 @@
 #ifndef INCLUDE_ARPA_INET_H
 #define INCLUDE_ARPA_INET_H
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 #include <netinet/in.h>
 

libc/include/assert.h

@@ -25,7 +25,7 @@
 #ifndef _ASSERT_H
 #define _ASSERT_H 1
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 /* stdlib.h is not needed, but GCC fixincludes thinks it is, so fool it. */
 #if 0

libc/include/byteswap.h

@@ -25,7 +25,7 @@
 #ifndef _BYTESWAP_H
 #define _BYTESWAP_H 1
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 #include <__/byteswap.h>
 

libc/include/calltrace.h

@@ -25,7 +25,7 @@
 #ifndef _CALLTRACE_H
 #define _CALLTRACE_H 1
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 __BEGIN_DECLS
 

libc/include/ctype.h

@@ -27,7 +27,7 @@
 #ifndef _CTYPE_H
 #define _CTYPE_H 1
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 __BEGIN_DECLS
 

libc/include/dirent.h

@@ -25,7 +25,7 @@
 #ifndef INCLUDE_DIRENT_H
 #define INCLUDE_DIRENT_H
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 #include <sys/__/types.h>
 

libc/include/dlfcn.h

@@ -25,7 +25,7 @@
 #ifndef _DLFCN_H
 #define _DLFCN_H 1
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 __BEGIN_DECLS
 

libc/include/endian.h

@@ -25,7 +25,7 @@
 #ifndef _ENDIAN_H
 #define _ENDIAN_H 1
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 #include <__/endian.h>
 

libc/include/errno.h

@@ -25,7 +25,7 @@
 #ifndef INCLUDE_ERRNO_H
 #define INCLUDE_ERRNO_H
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 __BEGIN_DECLS
 

libc/include/error.h

@@ -25,7 +25,7 @@
 #ifndef INCLUDE_ERROR_H
 #define INCLUDE_ERROR_H
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 __BEGIN_DECLS
 

libc/include/fcntl.h

@@ -27,7 +27,7 @@
 #ifndef INCLUDE_FCNTL_H
 #define INCLUDE_FCNTL_H
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 #include <sys/__/types.h>
 

libc/include/features.h

@@ -18,12 +18,12 @@
     along with the Sortix C Library. If not, see <http://www.gnu.org/licenses/>.
 
     features.h
-    Various things for various systems, programs, compabillity, and whatnot.
+    Detects the appropriate standard that this translation unit uses.
 
 *******************************************************************************/
 
 #ifndef INCLUDE_FEATURES_H
-#define INCLUDE_FEATURES_H 1
+#define INCLUDE_FEATURES_H
 
 #define __sortix_libc__ 1
 
@@ -46,25 +46,6 @@
 	(((gcc_major) == __GNUC__ && (gcc_minor) >= __GNUC_MINOR__) || \
 	 ((gcc_major) < __GNUC__))
 
-/* Preprocessor trick to turn anything into a string. */
-#define __STRINGIFY(x) #x
-
-/* Issue warning when this is used, except in defines, where the warning is
-   inserted whenever the macro is expanded. This can be used to deprecated
-   macros - and it happens on preprocessor level - so it shouldn't change any
-   semantics of any code that uses such a macro. The argument msg should be a
-   string that contains the warning. */
-#define __PRAGMA_WARNING(msg) _Pragma(__STRINGIFY(GCC warning msg))
-
-/* C++ needs to know that types and declarations are C, not C++. */
-#ifdef __cplusplus
-	#define __BEGIN_DECLS   extern "C" {
-	#define __END_DECLS     }
-#else
-	#define __BEGIN_DECLS
-	#define __END_DECLS
-#endif
-
 /* Sortix system components implicitly use the native API. */
 #if __is_sortix_system_component
 #define _SORTIX_SOURCE 1
@@ -100,21 +81,6 @@
 #define __HAS_RESTRICT 1
 #endif
 
-/* Use the real restrict keyword if it is available. Not that this really
-   matters as gcc uses __restrict and __restrict__ as aliases for restrict, but
-   it will look nicer after preprocessing. */
-#if __HAS_RESTRICT
-#undef __restrict
-#define __restrict restrict
-#endif
-
-/* Provide the restrict keyword if requested and unavailable. */
-#if !__HAS_RESTRICT && __want_restrict
-#define restrict __restrict
-#undef __HAS_RESTRICT
-#define __HAS_RESTRICT 2
-#endif
-
 /* Provide the full <stdint.h> in all system components. */
 #if __is_sortix_system_component
 #undef __STDC_CONSTANT_MACROS
@@ -123,6 +89,4 @@
 #define __STDC_LIMIT_MACROS
 #endif
 
-#define __pure2 __attribute__((__const__))
-
 #endif

libc/include/getopt.h

@@ -25,7 +25,7 @@
 #ifndef INCLUDE_GETOPT_H
 #define INCLUDE_GETOPT_H
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 __BEGIN_DECLS
 

libc/include/grp.h

@@ -25,7 +25,7 @@
 #ifndef INCLUDE_GRP_H
 #define INCLUDE_GRP_H
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 #include <sys/__/types.h>
 

libc/include/inttypes.h

@@ -25,7 +25,7 @@
 #ifndef INCLUDE_INTTYPES_H
 #define INCLUDE_INTTYPES_H
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 #include <sys/__/types.h>
 

libc/include/ioleast.h

@@ -28,7 +28,7 @@
 #ifndef INCLUDE_IOLEAST_H
 #define INCLUDE_IOLEAST_H
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 #include <sys/__/types.h>
 

libc/include/libgen.h

@@ -25,7 +25,7 @@
 #ifndef INCLUDE_LIBGEN_H
 #define INCLUDE_LIBGEN_H
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 __BEGIN_DECLS
 

libc/include/locale.h

@@ -25,7 +25,7 @@
 #ifndef _LOCALE_H
 #define _LOCALE_H 1
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 #include <sys/__/types.h>
 

libc/include/malloc.h

@@ -25,7 +25,7 @@
 #ifndef _MALLOC_H
 #define _MALLOC_H 1
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 __BEGIN_DECLS
 

libc/include/netdb.h

@@ -25,7 +25,7 @@
 #ifndef _NETDB_H
 #define _NETDB_H 1
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 #include <sys/__/types.h>
 

libc/include/netinet/in.h

@@ -25,7 +25,7 @@
 #ifndef INCLUDE_NETINET_IN_H
 #define INCLUDE_NETINET_IN_H
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 #include <sys/__/types.h>
 #include <__/endian.h>

libc/include/poll.h

@@ -25,7 +25,7 @@
 #ifndef _POLL_H
 #define _POLL_H 1
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 #include <sys/__/types.h>
 

libc/include/pwd.h

@@ -25,7 +25,7 @@
 #ifndef INCLUDE_PWD_H
 #define INCLUDE_PWD_H
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 #include <sys/__/types.h>
 

libc/include/setjmp.h

@@ -25,7 +25,7 @@
 #ifndef _SETJMP_H
 #define _SETJMP_H 1
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 __BEGIN_DECLS
 

libc/include/signal.h

@@ -25,7 +25,7 @@
 #ifndef INCLUDE_SIGNAL_H
 #define INCLUDE_SIGNAL_H
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 #include <sys/__/types.h>
 

libc/include/stdint.h

@@ -25,7 +25,7 @@
 #ifndef _STDINT_H
 #define _STDINT_H 1
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 #include <__/stdint.h>
 

libc/include/stdio.h

@@ -25,7 +25,7 @@
 #ifndef INCLUDE_STDIO_H
 #define INCLUDE_STDIO_H
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 #include <sys/__/types.h>
 

libc/include/stdio_ext.h

@@ -25,7 +25,7 @@
 #ifndef _STDIO_EXT_H
 #define _STDIO_EXT_H 1
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 #include <stdio.h>
 

libc/include/stdlib.h

@@ -25,7 +25,7 @@
 #ifndef _STDLIB_H
 #define _STDLIB_H 1
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 #include <sys/__/types.h>
 

libc/include/string.h

@@ -25,7 +25,7 @@
 #ifndef INCLUDE_STRING_H
 #define INCLUDE_STRING_H
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 #include <sys/__/types.h>
 

libc/include/sys/__/types.h

@@ -25,7 +25,7 @@
 #ifndef INCLUDE_SYS____TYPES_H
 #define INCLUDE_SYS____TYPES_H
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 #include <sortix/__/types.h>
 

libc/include/sys/cdefs.h

@@ -0,0 +1,66 @@
+/*******************************************************************************
+
+    Copyright(C) Jonas 'Sortie' Termansen 2011, 2012, 2013.
+
+    This file is part of the Sortix C Library.
+
+    The Sortix C Library is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or (at your
+    option) any later version.
+
+    The Sortix C Library is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+    or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+    License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with the Sortix C Library. If not, see <http://www.gnu.org/licenses/>.
+
+    sys/cdefs.h
+    Declares internal macros for the C programming language.
+
+*******************************************************************************/
+
+#ifndef INCLUDE_SYS_CDEFS_H
+#define INCLUDE_SYS_CDEFS_H
+
+#include <features.h>
+
+/* Preprocessor trick to turn anything into a string. */
+#define __STRINGIFY(x) #x
+
+/* Issue warning when this is used, except in defines, where the warning is
+   inserted whenever the macro is expanded. This can be used to deprecated
+   macros - and it happens on preprocessor level - so it shouldn't change any
+   semantics of any code that uses such a macro. The argument msg should be a
+   string that contains the warning. */
+#define __PRAGMA_WARNING(msg) _Pragma(__STRINGIFY(GCC warning msg))
+
+/* C++ needs to know that types and declarations are C, not C++. */
+#ifdef __cplusplus
+	#define __BEGIN_DECLS   extern "C" {
+	#define __END_DECLS     }
+#else
+	#define __BEGIN_DECLS
+	#define __END_DECLS
+#endif
+
+/* Use the real restrict keyword if it is available. Not that this really
+   matters as gcc uses __restrict and __restrict__ as aliases for restrict, but
+   it will look nicer after preprocessing. */
+#if __HAS_RESTRICT
+#undef __restrict
+#define __restrict restrict
+#endif
+
+/* Provide the restrict keyword if requested and unavailable. */
+#if !__HAS_RESTRICT && __want_restrict
+#define restrict __restrict
+#undef __HAS_RESTRICT
+#define __HAS_RESTRICT 2
+#endif
+
+#define __pure2 __attribute__((__const__))
+
+#endif

libc/include/sys/display.h

@@ -25,7 +25,7 @@
 #ifndef INCLUDE_SYS_DISPLAY_H
 #define INCLUDE_SYS_DISPLAY_H
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 #include <stddef.h>
 #include <stdint.h>

libc/include/sys/ioctl.h

@@ -25,7 +25,7 @@
 #ifndef INCLUDE_SYS_IOCTL_H
 #define INCLUDE_SYS_IOCTL_H
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 __BEGIN_DECLS
 

libc/include/sys/kernelinfo.h

@@ -25,7 +25,7 @@
 #ifndef _SYS_KERNELINFO_H
 #define _SYS_KERNELINFO_H 1
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 #include <sys/__/types.h>
 

libc/include/sys/keycodes.h

@@ -25,7 +25,7 @@
 #ifndef INCLUDE_SYS_KEYCODES_H
 #define INCLUDE_SYS_KEYCODES_H
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 #include <sortix/keycodes.h>
 

libc/include/sys/mman.h

@@ -25,7 +25,7 @@
 #ifndef INCLUDE_SYS_MMAN_H
 #define INCLUDE_SYS_MMAN_H
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 #include <sys/__/types.h>
 

libc/include/sys/readdirents.h

@@ -25,7 +25,7 @@
 #ifndef _SYS_READDIRENTS_H
 #define _SYS_READDIRENTS_H 1
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 #include <sys/__/types.h>
 

libc/include/sys/resource.h

@@ -25,7 +25,7 @@
 #ifndef INCLUDE_SYS_RESOURCE_H
 #define INCLUDE_SYS_RESOURCE_H
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 #include <sys/__/types.h>
 

libc/include/sys/select.h

@@ -26,7 +26,7 @@
 #ifndef _SYS_SELECT_H
 #define _SYS_SELECT_H 1
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 #include <sys/__/types.h>
 

libc/include/sys/socket.h

@@ -25,7 +25,7 @@
 #ifndef _SYS_SOCKET_H
 #define _SYS_SOCKET_H 1
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 #include <sys/__/types.h>
 

libc/include/sys/stat.h

@@ -25,7 +25,7 @@
 #ifndef INCLUDE_SYS_STAT_H
 #define INCLUDE_SYS_STAT_H
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 #include <sys/__/types.h>
 

libc/include/sys/syscall.h

@@ -29,7 +29,7 @@
 #ifndef _SYS_SYSCALL_H
 #define _SYS_SYSCALL_H 1
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 #include <sortix/syscallnum.h>
 

libc/include/sys/termmode.h

@@ -25,7 +25,7 @@
 #ifndef INCLUDE_SYS_TERMMODE_H
 #define INCLUDE_SYS_TERMMODE_H
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 #include <sortix/termmode.h>
 

libc/include/sys/time.h

@@ -25,7 +25,7 @@
 #ifndef _SYS_TIME_H
 #define _SYS_TIME_H 1
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 #include <sys/__/types.h>
 

libc/include/sys/times.h

@@ -25,7 +25,7 @@
 #ifndef INCLUDE_SYS_TIMES_H
 #define INCLUDE_SYS_TIMES_H
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 #include <sys/__/types.h>
 

libc/include/sys/types.h

@@ -27,7 +27,7 @@
 #ifndef INCLUDE_SYS_TYPES_H
 #define INCLUDE_SYS_TYPES_H
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 #include <sys/__/types.h>
 

libc/include/sys/uio.h

@@ -25,7 +25,7 @@
 #ifndef INCLUDE_SYS_UIO_H
 #define INCLUDE_SYS_UIO_H
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 #include <sys/__/types.h>
 

libc/include/sys/un.h

@@ -25,7 +25,7 @@
 #ifndef _SYS_UN_H
 #define _SYS_UN_H 1
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 #include <sys/__/types.h>
 

libc/include/sys/wait.h

@@ -27,7 +27,7 @@
 #ifndef _SYS_WAIT_H
 #define _SYS_WAIT_H 1
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 #include <sys/__/types.h>
 

libc/include/termios.h

@@ -27,7 +27,7 @@
 #ifndef _TERMIOS_H
 #define _TERMIOS_H 1
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 #include <stddef.h>
 #include <sortix/termios.h>

libc/include/time.h

@@ -25,7 +25,7 @@
 #ifndef INCLUDE_TIME_H
 #define INCLUDE_TIME_H
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 #include <sys/__/types.h>
 

libc/include/timespec.h

@@ -25,7 +25,7 @@
 #ifndef INCLUDE_TIMESPEC_H
 #define INCLUDE_TIMESPEC_H
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 #include <sys/__/types.h>
 

libc/include/unistd.h

@@ -28,7 +28,7 @@
 #ifndef _UNISTD_H
 #define _UNISTD_H 1
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 #include <sys/__/types.h>
 #include <__/stdint.h>

libc/include/utime.h

@@ -25,7 +25,7 @@
 #ifndef INCLUDE_UTIME_H
 #define INCLUDE_UTIME_H
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 #include <sys/__/types.h>
 

libc/include/wchar.h

@@ -25,7 +25,7 @@
 #ifndef INCLUDE_WCHAR_H
 #define INCLUDE_WCHAR_H
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 #include <sys/__/types.h>
 

libc/include/wctype.h

@@ -25,7 +25,7 @@
 #ifndef _WCTYPE_H
 #define _WCTYPE_H 1
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 #include <sys/__/types.h>
 

libc/stdio/fdio.h

@@ -25,7 +25,7 @@
 #ifndef STDIO_FDIO_H
 #define STDIO_FDIO_H 1
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 __BEGIN_DECLS
 

libm/include/__/math.h

@@ -26,7 +26,7 @@
 #ifndef INCLUDE____MATH_H
 #define INCLUDE____MATH_H
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 #if defined(__sortix__)
 #include <__/wordsize.h>

libm/include/complex.h

@@ -8,7 +8,7 @@
 #ifndef INCLUDE_COMPLEX_H
 #define INCLUDE_COMPLEX_H
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 #ifndef __sortix_libm__
 #define __sortix_libm__ 1

libm/include/fenv.h

@@ -28,7 +28,7 @@
 #ifndef INCLUDE_FENV_H
 #define INCLUDE_FENV_H
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 #ifndef __sortix_libm__
 #define __sortix_libm__ 1

libm/include/ieee754.h

@@ -26,7 +26,7 @@
 #ifndef INCLUDE_IEEE754_H
 #define INCLUDE_IEEE754_H
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 #ifndef __sortix_libm__
 #define __sortix_libm__ 1

libm/include/ieeefp.h

@@ -8,7 +8,7 @@
 #ifndef INCLUDE_IEEEFP_H
 #define INCLUDE_IEEEFP_H
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 #ifndef __sortix_libm__
 #define __sortix_libm__ 1

libm/include/math.h

@@ -26,7 +26,7 @@
 #ifndef INCLUDE_MATH_H
 #define INCLUDE_MATH_H
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 #ifndef __sortix_libm__
 #define __sortix_libm__ 1

libm/include/tgmath.h

@@ -30,7 +30,7 @@
 #ifndef INCLUDE_TGMATH_H
 #define INCLUDE_TGMATH_H
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 #ifndef __sortix_libm__
 #define __sortix_libm__ 1

libm/src/sys/cdefs.h

@@ -34,9 +34,7 @@
  *	@(#)cdefs.h	8.8 (Berkeley) 1/9/95
  */
 
-#if !defined(__sortix__)
 #include_next <sys/cdefs.h>
-#endif
 
 #if !defined(_C_LABEL)
 #define _C_LABEL(x) x

sortix/include/sortix/__/types.h

@@ -25,7 +25,7 @@
 #ifndef INCLUDE_SORTIX____TYPES_H
 #define INCLUDE_SORTIX____TYPES_H
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 #include <__/stdint.h>
 #include <__/wordsize.h>

sortix/include/sortix/clock.h

@@ -25,7 +25,7 @@
 #ifndef INCLUDE_SORTIX_CLOCK_H
 #define INCLUDE_SORTIX_CLOCK_H
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 __BEGIN_DECLS
 

sortix/include/sortix/dirent.h

@@ -25,7 +25,7 @@
 #ifndef INCLUDE_SORTIX_DIRENT_H
 #define INCLUDE_SORTIX_DIRENT_H
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 __BEGIN_DECLS
 

sortix/include/sortix/display.h

@@ -25,7 +25,7 @@
 #ifndef SORTIX_INCLUDE_DISPLAY_H
 #define SORTIX_INCLUDE_DISPLAY_H
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 #include <stdint.h>
 

sortix/include/sortix/fcntl.h

@@ -25,7 +25,7 @@
 #ifndef INCLUDE_SORTIX_FCNTL_H
 #define INCLUDE_SORTIX_FCNTL_H
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 __BEGIN_DECLS
 

sortix/include/sortix/fork.h

@@ -25,7 +25,7 @@
 #ifndef SORTIX_FORK_H
 #define SORTIX_FORK_H
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 #include <sortix/x86/fork.h>
 #include <sortix/x64/fork.h>

sortix/include/sortix/initrd.h

@@ -25,7 +25,7 @@
 #ifndef INCLUDE_SORTIX_INITRD_H
 #define INCLUDE_SORTIX_INITRD_H
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 __BEGIN_DECLS
 

sortix/include/sortix/itimerspec.h

@@ -25,7 +25,7 @@
 #ifndef INCLUDE_SORTIX_ITIMERSPEC_H
 #define INCLUDE_SORTIX_ITIMERSPEC_H
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 __BEGIN_DECLS
 

sortix/include/sortix/mount.h

@@ -25,7 +25,7 @@
 #ifndef SORTIX_INCLUDE_MOUNT_H
 #define SORTIX_INCLUDE_MOUNT_H
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 __BEGIN_DECLS
 

sortix/include/sortix/poll.h

@@ -25,7 +25,7 @@
 #ifndef INCLUDE_SORTIX_POLL_H
 #define INCLUDE_SORTIX_POLL_H
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 __BEGIN_DECLS
 

sortix/include/sortix/resource.h

@@ -25,7 +25,7 @@
 #ifndef INCLUDE_SORTIX_RESOURCE_H
 #define INCLUDE_SORTIX_RESOURCE_H
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 #include <__/stdint.h>
 

sortix/include/sortix/seek.h

@@ -25,7 +25,7 @@
 #ifndef SORTIX_SEEK_H
 #define SORTIX_SEEK_H
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 __BEGIN_DECLS
 

sortix/include/sortix/sigevent.h

@@ -25,7 +25,7 @@
 #ifndef INCLUDE_SORTIX_SIGEVENT_H
 #define INCLUDE_SORTIX_SIGEVENT_H
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 __BEGIN_DECLS
 

sortix/include/sortix/signal.h

@@ -27,7 +27,7 @@
 
 /* TODO: Yes, signals are implemented in a non-standard manner for now. */
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 __BEGIN_DECLS
 

sortix/include/sortix/sigset.h

@@ -25,7 +25,7 @@
 #ifndef INCLUDE_SORTIX_SIGSET_H
 #define INCLUDE_SORTIX_SIGSET_H
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 __BEGIN_DECLS
 

sortix/include/sortix/socket.h

@@ -25,7 +25,7 @@
 #ifndef SORTIX_INCLUDE_SOCKET_H
 #define SORTIX_INCLUDE_SOCKET_H
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 __BEGIN_DECLS
 

sortix/include/sortix/stat.h

@@ -26,7 +26,7 @@
 #ifndef INCLUDE_SORTIX_STAT_H
 #define INCLUDE_SORTIX_STAT_H
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 #include <sys/types.h>
 #include <sortix/timespec.h>

sortix/include/sortix/termios.h

@@ -25,7 +25,7 @@
 #ifndef SORTIX_TERMIOS_H
 #define SORTIX_TERMIOS_H
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 __BEGIN_DECLS
 

sortix/include/sortix/time.h

@@ -25,7 +25,7 @@
 #ifndef INCLUDE_SORTIX_TIME_H
 #define INCLUDE_SORTIX_TIME_H
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 __BEGIN_DECLS
 

sortix/include/sortix/timespec.h

@@ -25,7 +25,7 @@
 #ifndef INCLUDE_SORTIX_TIMESPEC_H
 #define INCLUDE_SORTIX_TIMESPEC_H
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 __BEGIN_DECLS
 

sortix/include/sortix/tmns.h

@@ -25,7 +25,7 @@
 #ifndef INCLUDE_SORTIX_TMNS_H
 #define INCLUDE_SORTIX_TMNS_H
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 #include <sortix/timespec.h>
 

sortix/include/sortix/uio.h

@@ -25,7 +25,7 @@
 #ifndef INCLUDE_SORTIX_UIO_H
 #define INCLUDE_SORTIX_UIO_H
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 __BEGIN_DECLS
 

sortix/include/sortix/unistd.h

@@ -25,7 +25,7 @@
 #ifndef SORTIX_UNISTD_H
 #define SORTIX_UNISTD_H
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 __BEGIN_DECLS
 

sortix/include/sortix/vga.h

@@ -25,7 +25,7 @@
 #ifndef INC_SORTIX_VGA_H
 #define INC_SORTIX_VGA_H
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 __BEGIN_DECLS
 

sortix/include/sortix/wait.h

@@ -25,7 +25,7 @@
 #ifndef INCLUDE_SORTIX_WAIT_H
 #define INCLUDE_SORTIX_WAIT_H
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 __BEGIN_DECLS
 

sortix/include/sortix/x64/fork.h

@@ -25,7 +25,7 @@
 #ifndef SORTIX_X64_FORK_H
 #define SORTIX_X64_FORK_H
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 __BEGIN_DECLS
 

sortix/include/sortix/x86/fork.h

@@ -25,7 +25,7 @@
 #ifndef SORTIX_X86_FORK_H
 #define SORTIX_X86_FORK_H
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 __BEGIN_DECLS