From ad1c6e0ed7387731e66a0d9c01b8d96b71f1ad73 Mon Sep 17 00:00:00 2001 From: Jonas 'Sortie' Termansen Date: Mon, 23 Sep 2013 16:37:33 +0200 Subject: [PATCH] Remove inclusion from . --- libc/include/__/endian.h | 1 + libc/include/__/stdint.h | 2 +- libc/include/alloca.h | 2 ++ libc/include/byteswap.h | 1 + libc/include/dirent.h | 2 ++ libc/include/fcntl.h | 3 +++ libc/include/features.h | 6 ------ libc/include/grp.h | 2 ++ libc/include/inttypes.h | 3 +++ libc/include/locale.h | 2 ++ libc/include/netdb.h | 3 +++ libc/include/netinet/in.h | 5 ++++- libc/include/poll.h | 2 ++ libc/include/pwd.h | 2 ++ libc/include/signal.h | 3 +++ libc/include/stdint.h | 1 + libc/include/stdio.h | 3 +++ libc/include/stdio_ext.h | 1 + libc/include/stdlib.h | 3 +++ libc/include/string.h | 3 +++ libc/include/sys/__/types.h | 1 + libc/include/sys/display.h | 1 + libc/include/sys/kernelinfo.h | 2 ++ libc/include/sys/keycodes.h | 1 + libc/include/sys/mman.h | 3 +++ libc/include/sys/readdirents.h | 3 +++ libc/include/sys/resource.h | 3 +++ libc/include/sys/select.h | 3 +++ libc/include/sys/socket.h | 3 +++ libc/include/sys/stat.h | 2 ++ libc/include/sys/syscall.h | 1 + libc/include/sys/termmode.h | 1 + libc/include/sys/time.h | 2 ++ libc/include/sys/times.h | 2 ++ libc/include/sys/types.h | 1 + libc/include/sys/uio.h | 2 ++ libc/include/sys/un.h | 2 ++ libc/include/sys/wait.h | 3 +++ libc/include/termios.h | 1 + libc/include/time.h | 2 ++ libc/include/timespec.h | 3 +++ libc/include/unistd.h | 3 +++ libc/include/utime.h | 2 ++ libc/include/wchar.h | 2 ++ libc/include/wctype.h | 2 ++ sortix/include/sortix/__/types.h | 1 + sortix/include/sortix/display.h | 1 + sortix/include/sortix/fork.h | 1 + sortix/include/sortix/resource.h | 1 + sortix/include/sortix/stat.h | 1 + sortix/include/sortix/tmns.h | 1 + 51 files changed, 99 insertions(+), 8 deletions(-) diff --git a/libc/include/__/endian.h b/libc/include/__/endian.h index dff6635f..3e0ce2cd 100644 --- a/libc/include/__/endian.h +++ b/libc/include/__/endian.h @@ -26,6 +26,7 @@ #define INCLUDE____ENDIAN_H #include + #include <__/byteswap.h> __BEGIN_DECLS diff --git a/libc/include/__/stdint.h b/libc/include/__/stdint.h index 80c2dbe3..a3864ad3 100644 --- a/libc/include/__/stdint.h +++ b/libc/include/__/stdint.h @@ -25,8 +25,8 @@ #ifndef INCLUDE____STDINT_H #define INCLUDE____STDINT_H -#define _LIBC_HACK_FEATURE_NO_DECLARATIONS #include + #include <__/wordsize.h> __BEGIN_DECLS diff --git a/libc/include/alloca.h b/libc/include/alloca.h index 96fca4f1..84e429b3 100644 --- a/libc/include/alloca.h +++ b/libc/include/alloca.h @@ -27,6 +27,8 @@ #include +#include + __BEGIN_DECLS @include(size_t.h) diff --git a/libc/include/byteswap.h b/libc/include/byteswap.h index 2a933899..c60d5b0f 100644 --- a/libc/include/byteswap.h +++ b/libc/include/byteswap.h @@ -26,6 +26,7 @@ #define _BYTESWAP_H 1 #include + #include <__/byteswap.h> __BEGIN_DECLS diff --git a/libc/include/dirent.h b/libc/include/dirent.h index 7a25fce0..30a098c7 100644 --- a/libc/include/dirent.h +++ b/libc/include/dirent.h @@ -27,6 +27,8 @@ #include +#include + __BEGIN_DECLS @include(ino_t.h) diff --git a/libc/include/fcntl.h b/libc/include/fcntl.h index 397d1ebf..9477240b 100644 --- a/libc/include/fcntl.h +++ b/libc/include/fcntl.h @@ -28,6 +28,9 @@ #define INCLUDE_FCNTL_H #include + +#include + #include #include #include diff --git a/libc/include/features.h b/libc/include/features.h index 5b59caf4..8159a280 100644 --- a/libc/include/features.h +++ b/libc/include/features.h @@ -128,10 +128,4 @@ /* Don't provide things from standard headers that is not implemented. */ /*#define __SORTIX_SHOW_UNIMPLEMENTED*/ -#if !defined(_LIBC_HACK_FEATURE_NO_DECLARATIONS) -#include -#endif - -#undef _LIBC_HACK_FEATURE_NO_DECLARATIONS - #endif diff --git a/libc/include/grp.h b/libc/include/grp.h index 8e0b9e90..7287d040 100644 --- a/libc/include/grp.h +++ b/libc/include/grp.h @@ -27,6 +27,8 @@ #include +#include + __BEGIN_DECLS @include(gid_t.h) diff --git a/libc/include/inttypes.h b/libc/include/inttypes.h index c454c6ad..531be51a 100644 --- a/libc/include/inttypes.h +++ b/libc/include/inttypes.h @@ -26,6 +26,9 @@ #define INCLUDE_INTTYPES_H #include + +#include + #include #define PRId8 __PRId8 diff --git a/libc/include/locale.h b/libc/include/locale.h index cf759395..16ebb7cc 100644 --- a/libc/include/locale.h +++ b/libc/include/locale.h @@ -27,6 +27,8 @@ #include +#include + __BEGIN_DECLS struct lconv diff --git a/libc/include/netdb.h b/libc/include/netdb.h index 7640fd16..e162e2d3 100644 --- a/libc/include/netdb.h +++ b/libc/include/netdb.h @@ -26,6 +26,9 @@ #define _NETDB_H 1 #include + +#include + #include __BEGIN_DECLS diff --git a/libc/include/netinet/in.h b/libc/include/netinet/in.h index b4413c60..8ba79157 100644 --- a/libc/include/netinet/in.h +++ b/libc/include/netinet/in.h @@ -26,9 +26,12 @@ #define INCLUDE_NETINET_IN_H #include -#include + +#include #include <__/endian.h> +#include + __BEGIN_DECLS @include(in_port_t.h) diff --git a/libc/include/poll.h b/libc/include/poll.h index 77717bfb..7a83eafe 100644 --- a/libc/include/poll.h +++ b/libc/include/poll.h @@ -27,6 +27,8 @@ #include +#include + __BEGIN_DECLS @include(time_t.h) diff --git a/libc/include/pwd.h b/libc/include/pwd.h index aa1967b0..30fa8176 100644 --- a/libc/include/pwd.h +++ b/libc/include/pwd.h @@ -27,6 +27,8 @@ #include +#include + __BEGIN_DECLS @include(gid_t.h) diff --git a/libc/include/signal.h b/libc/include/signal.h index 92927af0..9c13571e 100644 --- a/libc/include/signal.h +++ b/libc/include/signal.h @@ -26,6 +26,9 @@ #define INCLUDE_SIGNAL_H #include + +#include + #include __BEGIN_DECLS diff --git a/libc/include/stdint.h b/libc/include/stdint.h index 08554b77..c633dbab 100644 --- a/libc/include/stdint.h +++ b/libc/include/stdint.h @@ -26,6 +26,7 @@ #define _STDINT_H 1 #include + #include <__/stdint.h> __BEGIN_DECLS diff --git a/libc/include/stdio.h b/libc/include/stdio.h index 6736e7f6..5a9aa1c5 100644 --- a/libc/include/stdio.h +++ b/libc/include/stdio.h @@ -26,6 +26,9 @@ #define INCLUDE_STDIO_H #include + +#include + #include #if __STRICT_ANSI__ #define __need___va_list diff --git a/libc/include/stdio_ext.h b/libc/include/stdio_ext.h index e2a5bb5d..ec3f9871 100644 --- a/libc/include/stdio_ext.h +++ b/libc/include/stdio_ext.h @@ -26,6 +26,7 @@ #define _STDIO_EXT_H 1 #include + #include enum diff --git a/libc/include/stdlib.h b/libc/include/stdlib.h index 57a74c5e..bfe50fa5 100644 --- a/libc/include/stdlib.h +++ b/libc/include/stdlib.h @@ -26,6 +26,9 @@ #define _STDLIB_H 1 #include + +#include + #include __BEGIN_DECLS diff --git a/libc/include/string.h b/libc/include/string.h index 9a2bfabd..e9f6a701 100644 --- a/libc/include/string.h +++ b/libc/include/string.h @@ -26,6 +26,9 @@ #define INCLUDE_STRING_H #include + +#include + #include __BEGIN_DECLS diff --git a/libc/include/sys/__/types.h b/libc/include/sys/__/types.h index bea79e5c..b06be10d 100644 --- a/libc/include/sys/__/types.h +++ b/libc/include/sys/__/types.h @@ -26,6 +26,7 @@ #define INCLUDE_SYS____TYPES_H #include + #include #endif diff --git a/libc/include/sys/display.h b/libc/include/sys/display.h index 1f197c66..77f7f921 100644 --- a/libc/include/sys/display.h +++ b/libc/include/sys/display.h @@ -26,6 +26,7 @@ #define INCLUDE_SYS_DISPLAY_H #include + #include #include #include diff --git a/libc/include/sys/kernelinfo.h b/libc/include/sys/kernelinfo.h index e520dc2b..789264cd 100644 --- a/libc/include/sys/kernelinfo.h +++ b/libc/include/sys/kernelinfo.h @@ -27,6 +27,8 @@ #include +#include + __BEGIN_DECLS @include(size_t.h) diff --git a/libc/include/sys/keycodes.h b/libc/include/sys/keycodes.h index 454db193..a8e33b7d 100644 --- a/libc/include/sys/keycodes.h +++ b/libc/include/sys/keycodes.h @@ -26,6 +26,7 @@ #define INCLUDE_SYS_KEYCODES_H #include + #include #endif diff --git a/libc/include/sys/mman.h b/libc/include/sys/mman.h index 6ddffeb7..fdc2465d 100644 --- a/libc/include/sys/mman.h +++ b/libc/include/sys/mman.h @@ -26,6 +26,9 @@ #define INCLUDE_SYS_MMAN_H #include + +#include + #include __BEGIN_DECLS diff --git a/libc/include/sys/readdirents.h b/libc/include/sys/readdirents.h index 0027b9e4..07c72d5a 100644 --- a/libc/include/sys/readdirents.h +++ b/libc/include/sys/readdirents.h @@ -26,6 +26,9 @@ #define _SYS_READDIRENTS_H 1 #include + +#include + #include #include #include diff --git a/libc/include/sys/resource.h b/libc/include/sys/resource.h index 18025da4..8d026654 100644 --- a/libc/include/sys/resource.h +++ b/libc/include/sys/resource.h @@ -26,6 +26,9 @@ #define INCLUDE_SYS_RESOURCE_H #include + +#include + #include __BEGIN_DECLS diff --git a/libc/include/sys/select.h b/libc/include/sys/select.h index 9be2114e..ba67f94d 100644 --- a/libc/include/sys/select.h +++ b/libc/include/sys/select.h @@ -27,6 +27,9 @@ #define _SYS_SELECT_H 1 #include + +#include + #include /* TODO: HACK: for FD_ZERO */ __BEGIN_DECLS diff --git a/libc/include/sys/socket.h b/libc/include/sys/socket.h index 1cbceade..759b07d4 100644 --- a/libc/include/sys/socket.h +++ b/libc/include/sys/socket.h @@ -26,6 +26,9 @@ #define _SYS_SOCKET_H 1 #include + +#include + /* TODO: #include */ #include diff --git a/libc/include/sys/stat.h b/libc/include/sys/stat.h index e135c2be..14e87d19 100644 --- a/libc/include/sys/stat.h +++ b/libc/include/sys/stat.h @@ -27,6 +27,8 @@ #include +#include + __BEGIN_DECLS @include(blkcnt_t.h) @include(blksize_t.h) diff --git a/libc/include/sys/syscall.h b/libc/include/sys/syscall.h index f2111120..85bb9633 100644 --- a/libc/include/sys/syscall.h +++ b/libc/include/sys/syscall.h @@ -30,6 +30,7 @@ #define _SYS_SYSCALL_H 1 #include + #include /* Expand a macro and convert it to string. */ diff --git a/libc/include/sys/termmode.h b/libc/include/sys/termmode.h index 78ad026c..13a1b5c2 100644 --- a/libc/include/sys/termmode.h +++ b/libc/include/sys/termmode.h @@ -26,6 +26,7 @@ #define INCLUDE_SYS_TERMMODE_H #include + #include __BEGIN_DECLS diff --git a/libc/include/sys/time.h b/libc/include/sys/time.h index 7f040e5a..81d09eb1 100644 --- a/libc/include/sys/time.h +++ b/libc/include/sys/time.h @@ -27,6 +27,8 @@ #include +#include + __BEGIN_DECLS @include(time_t.h) diff --git a/libc/include/sys/times.h b/libc/include/sys/times.h index e54a0254..d7d53947 100644 --- a/libc/include/sys/times.h +++ b/libc/include/sys/times.h @@ -27,6 +27,8 @@ #include +#include + __BEGIN_DECLS @include(clock_t.h); diff --git a/libc/include/sys/types.h b/libc/include/sys/types.h index b470f1d2..26e8f05f 100644 --- a/libc/include/sys/types.h +++ b/libc/include/sys/types.h @@ -28,6 +28,7 @@ #define INCLUDE_SYS_TYPES_H #include + #include __BEGIN_DECLS diff --git a/libc/include/sys/uio.h b/libc/include/sys/uio.h index 44616641..2269d7f2 100644 --- a/libc/include/sys/uio.h +++ b/libc/include/sys/uio.h @@ -27,6 +27,8 @@ #include +#include + __BEGIN_DECLS @include(size_t.h) diff --git a/libc/include/sys/un.h b/libc/include/sys/un.h index aca69a10..4690f33c 100644 --- a/libc/include/sys/un.h +++ b/libc/include/sys/un.h @@ -27,6 +27,8 @@ #include +#include + __BEGIN_DECLS @include(sa_family_t.h) diff --git a/libc/include/sys/wait.h b/libc/include/sys/wait.h index 92baef01..982dc315 100644 --- a/libc/include/sys/wait.h +++ b/libc/include/sys/wait.h @@ -28,6 +28,9 @@ #define _SYS_WAIT_H 1 #include + +#include + #include __BEGIN_DECLS diff --git a/libc/include/termios.h b/libc/include/termios.h index 9f3d2379..85b0ac1c 100644 --- a/libc/include/termios.h +++ b/libc/include/termios.h @@ -28,6 +28,7 @@ #define _TERMIOS_H 1 #include + #include #include diff --git a/libc/include/time.h b/libc/include/time.h index c9dff34f..ebb4f0c8 100644 --- a/libc/include/time.h +++ b/libc/include/time.h @@ -27,6 +27,8 @@ #include +#include + __BEGIN_DECLS @include(clock_t.h) diff --git a/libc/include/timespec.h b/libc/include/timespec.h index 3b274653..d8c37064 100644 --- a/libc/include/timespec.h +++ b/libc/include/timespec.h @@ -26,6 +26,9 @@ #define INCLUDE_TIMESPEC_H #include + +#include + #include __BEGIN_DECLS diff --git a/libc/include/unistd.h b/libc/include/unistd.h index fbdfc00a..d2cf8267 100644 --- a/libc/include/unistd.h +++ b/libc/include/unistd.h @@ -29,7 +29,10 @@ #define _UNISTD_H 1 #include + +#include #include <__/stdint.h> + #if defined(_SORTIX_SOURCE) #include #include diff --git a/libc/include/utime.h b/libc/include/utime.h index b316311e..c0fb64b2 100644 --- a/libc/include/utime.h +++ b/libc/include/utime.h @@ -27,6 +27,8 @@ #include +#include + __BEGIN_DECLS @include(time_t.h) diff --git a/libc/include/wchar.h b/libc/include/wchar.h index 1ecc2940..4fab5a1c 100644 --- a/libc/include/wchar.h +++ b/libc/include/wchar.h @@ -27,6 +27,8 @@ #include +#include + __BEGIN_DECLS @include(size_t.h) diff --git a/libc/include/wctype.h b/libc/include/wctype.h index 0f66a5cd..ec9277dc 100644 --- a/libc/include/wctype.h +++ b/libc/include/wctype.h @@ -27,6 +27,8 @@ #include +#include + __BEGIN_DECLS @include(wint_t.h) diff --git a/sortix/include/sortix/__/types.h b/sortix/include/sortix/__/types.h index 8e885e0c..68ef44c7 100644 --- a/sortix/include/sortix/__/types.h +++ b/sortix/include/sortix/__/types.h @@ -26,6 +26,7 @@ #define INCLUDE_SORTIX____TYPES_H #include + #include <__/stdint.h> #include <__/wordsize.h> diff --git a/sortix/include/sortix/display.h b/sortix/include/sortix/display.h index 3cd30db3..13c7d6f3 100644 --- a/sortix/include/sortix/display.h +++ b/sortix/include/sortix/display.h @@ -26,6 +26,7 @@ #define SORTIX_INCLUDE_DISPLAY_H #include + #include __BEGIN_DECLS diff --git a/sortix/include/sortix/fork.h b/sortix/include/sortix/fork.h index 4e701d62..48e140ff 100644 --- a/sortix/include/sortix/fork.h +++ b/sortix/include/sortix/fork.h @@ -26,6 +26,7 @@ #define SORTIX_FORK_H #include + #include #include diff --git a/sortix/include/sortix/resource.h b/sortix/include/sortix/resource.h index c60a4616..a1f0d22b 100644 --- a/sortix/include/sortix/resource.h +++ b/sortix/include/sortix/resource.h @@ -26,6 +26,7 @@ #define INCLUDE_SORTIX_RESOURCE_H #include + #include <__/stdint.h> __BEGIN_DECLS diff --git a/sortix/include/sortix/stat.h b/sortix/include/sortix/stat.h index 5ebd1c48..25559d18 100644 --- a/sortix/include/sortix/stat.h +++ b/sortix/include/sortix/stat.h @@ -27,6 +27,7 @@ #define INCLUDE_SORTIX_STAT_H #include + #include #include diff --git a/sortix/include/sortix/tmns.h b/sortix/include/sortix/tmns.h index d8a73cfa..209838bd 100644 --- a/sortix/include/sortix/tmns.h +++ b/sortix/include/sortix/tmns.h @@ -26,6 +26,7 @@ #define INCLUDE_SORTIX_TMNS_H #include + #include __BEGIN_DECLS