From 5aed6d67e3f051262c67e3295476bf13cfc099c4 Mon Sep 17 00:00:00 2001 From: Michael Jones Date: Thu, 11 Jul 2024 11:09:51 -0700 Subject: [PATCH] Reland: [libc] Move off_t and stdio macros to proxy hdrs (#98384) reland of https://github.com/llvm/llvm-project/pull/98215 Additionally adds proxy headers for FILE and the fopencookie types The arm32 build has been failing due to redefinitions of the off_t type. This patch fixes this by moving off_t to a proper proxy header. To do this, it also moves stdio macros to a proxy header to hopefully avoid including this proxy header alongside this public stdio.h. --- libc/config/gpu/api.td | 5 -- libc/config/linux/api.td | 3 - libc/hdr/CMakeLists.txt | 10 +++ libc/hdr/stdio_macros.h | 23 +++++ libc/hdr/types/CMakeLists.txt | 27 ++++++ libc/hdr/types/FILE.h | 22 +++++ libc/hdr/types/cookie_io_functions_t.h | 22 +++++ libc/hdr/types/off_t.h | 22 +++++ libc/include/llvm-libc-macros/stdio-macros.h | 4 + libc/newhdrgen/yaml/stdio.yaml | 6 -- libc/src/__support/File/CMakeLists.txt | 2 + libc/src/__support/File/file.cpp | 5 +- libc/src/__support/File/file.h | 3 +- libc/src/__support/File/linux/CMakeLists.txt | 10 +++ libc/src/__support/File/linux/file.cpp | 5 +- libc/src/__support/File/linux/file.h | 1 + libc/src/__support/File/linux/lseekImpl.h | 2 +- libc/src/__support/File/linux/stderr.cpp | 3 +- libc/src/__support/File/linux/stdin.cpp | 3 +- libc/src/__support/File/linux/stdout.cpp | 3 +- .../src/__support/OSUtil/linux/CMakeLists.txt | 1 + libc/src/__support/OSUtil/linux/fcntl.cpp | 1 + libc/src/gpu/rpc_fprintf.h | 2 +- libc/src/stdio/CMakeLists.txt | 16 ++-- libc/src/stdio/baremetal/getchar.cpp | 2 +- libc/src/stdio/baremetal/printf.cpp | 1 + libc/src/stdio/baremetal/vprintf.cpp | 1 + libc/src/stdio/clearerr.h | 2 +- libc/src/stdio/clearerr_unlocked.h | 2 +- libc/src/stdio/fclose.h | 2 +- libc/src/stdio/fdopen.h | 4 +- libc/src/stdio/feof.h | 2 +- libc/src/stdio/feof_unlocked.h | 2 +- libc/src/stdio/ferror.h | 2 +- libc/src/stdio/ferror_unlocked.h | 2 +- libc/src/stdio/fflush.h | 2 +- libc/src/stdio/fgetc.h | 2 +- libc/src/stdio/fgetc_unlocked.h | 2 +- libc/src/stdio/fgets.h | 2 +- libc/src/stdio/flockfile.cpp | 2 +- libc/src/stdio/flockfile.h | 2 +- libc/src/stdio/fopen.h | 2 +- libc/src/stdio/fopencookie.cpp | 6 +- libc/src/stdio/fopencookie.h | 3 +- libc/src/stdio/fprintf.cpp | 2 +- libc/src/stdio/fprintf.h | 2 +- libc/src/stdio/fputc.h | 2 +- libc/src/stdio/fputs.h | 2 +- libc/src/stdio/fread.h | 3 +- libc/src/stdio/fread_unlocked.h | 3 +- libc/src/stdio/fscanf.cpp | 2 +- libc/src/stdio/fscanf.h | 2 +- libc/src/stdio/fseek.h | 2 +- libc/src/stdio/fseeko.h | 3 +- libc/src/stdio/ftell.h | 2 +- libc/src/stdio/ftello.h | 3 +- libc/src/stdio/funlockfile.cpp | 2 +- libc/src/stdio/funlockfile.h | 2 +- libc/src/stdio/fwrite.h | 3 +- libc/src/stdio/fwrite_unlocked.h | 3 +- libc/src/stdio/generic/CMakeLists.txt | 60 ++++++------- libc/src/stdio/generic/clearerr.cpp | 2 +- libc/src/stdio/generic/clearerr_unlocked.cpp | 2 +- libc/src/stdio/generic/fclose.cpp | 2 +- libc/src/stdio/generic/feof.cpp | 2 +- libc/src/stdio/generic/feof_unlocked.cpp | 2 +- libc/src/stdio/generic/ferror.cpp | 2 +- libc/src/stdio/generic/ferror_unlocked.cpp | 2 +- libc/src/stdio/generic/fflush.cpp | 2 +- libc/src/stdio/generic/fgetc.cpp | 3 +- libc/src/stdio/generic/fgetc_unlocked.cpp | 3 +- libc/src/stdio/generic/fgets.cpp | 2 +- libc/src/stdio/generic/fopen.cpp | 2 +- libc/src/stdio/generic/fputc.cpp | 3 +- libc/src/stdio/generic/fputs.cpp | 3 +- libc/src/stdio/generic/fread.cpp | 3 +- libc/src/stdio/generic/fread_unlocked.cpp | 3 +- libc/src/stdio/generic/fwrite.cpp | 3 +- libc/src/stdio/generic/fwrite_unlocked.cpp | 3 +- libc/src/stdio/generic/getc.cpp | 3 +- libc/src/stdio/generic/getc_unlocked.cpp | 3 +- libc/src/stdio/generic/getchar.cpp | 2 +- libc/src/stdio/generic/getchar_unlocked.cpp | 2 +- libc/src/stdio/generic/printf.cpp | 2 +- libc/src/stdio/generic/putc.cpp | 3 +- libc/src/stdio/generic/putchar.cpp | 3 +- libc/src/stdio/generic/puts.cpp | 3 +- libc/src/stdio/generic/stderr.cpp | 2 +- libc/src/stdio/generic/stdin.cpp | 2 +- libc/src/stdio/generic/stdout.cpp | 2 +- libc/src/stdio/generic/ungetc.cpp | 2 +- libc/src/stdio/generic/vprintf.cpp | 2 +- libc/src/stdio/getc.h | 2 +- libc/src/stdio/getc_unlocked.h | 2 +- libc/src/stdio/gpu/CMakeLists.txt | 87 +++++++------------ libc/src/stdio/gpu/clearerr.cpp | 2 +- libc/src/stdio/gpu/fclose.cpp | 3 +- libc/src/stdio/gpu/feof.cpp | 2 +- libc/src/stdio/gpu/ferror.cpp | 2 +- libc/src/stdio/gpu/fflush.cpp | 2 +- libc/src/stdio/gpu/fgetc.cpp | 3 +- libc/src/stdio/gpu/fgets.cpp | 3 +- libc/src/stdio/gpu/file.h | 4 +- libc/src/stdio/gpu/fopen.cpp | 2 +- libc/src/stdio/gpu/fputc.cpp | 5 +- libc/src/stdio/gpu/fputs.cpp | 3 +- libc/src/stdio/gpu/fread.cpp | 2 +- libc/src/stdio/gpu/fseek.cpp | 2 +- libc/src/stdio/gpu/ftell.cpp | 2 +- libc/src/stdio/gpu/fwrite.cpp | 2 +- libc/src/stdio/gpu/getc.cpp | 3 +- libc/src/stdio/gpu/getchar.cpp | 5 +- libc/src/stdio/gpu/putc.cpp | 3 +- libc/src/stdio/gpu/putchar.cpp | 7 +- libc/src/stdio/gpu/puts.cpp | 5 +- libc/src/stdio/gpu/remove.cpp | 2 +- libc/src/stdio/gpu/stderr.cpp | 2 +- libc/src/stdio/gpu/stdin.cpp | 2 +- libc/src/stdio/gpu/stdout.cpp | 2 +- libc/src/stdio/gpu/ungetc.cpp | 2 +- libc/src/stdio/printf.h | 2 +- .../src/stdio/printf_core/vfprintf_internal.h | 2 +- libc/src/stdio/putc.h | 2 +- libc/src/stdio/remove.h | 2 +- libc/src/stdio/scanf.cpp | 2 +- libc/src/stdio/scanf_core/vfscanf_internal.h | 3 +- libc/src/stdio/setbuf.cpp | 3 +- libc/src/stdio/setbuf.h | 2 +- libc/src/stdio/setvbuf.cpp | 3 +- libc/src/stdio/setvbuf.h | 3 +- libc/src/stdio/sscanf.cpp | 3 +- libc/src/stdio/ungetc.h | 2 +- libc/src/stdio/vfprintf.cpp | 2 +- libc/src/stdio/vfprintf.h | 2 +- libc/src/stdio/vprintf.h | 2 +- libc/src/unistd/getopt.cpp | 2 +- libc/src/unistd/getopt.h | 2 +- libc/src/wchar/btowc.cpp | 2 +- libc/src/wchar/wctob.cpp | 2 +- .../llvm-project-overlay/libc/BUILD.bazel | 23 +++++ 140 files changed, 415 insertions(+), 233 deletions(-) create mode 100644 libc/hdr/stdio_macros.h create mode 100644 libc/hdr/types/FILE.h create mode 100644 libc/hdr/types/cookie_io_functions_t.h create mode 100644 libc/hdr/types/off_t.h diff --git a/libc/config/gpu/api.td b/libc/config/gpu/api.td index 523ad49ffa3fd4..21ddbb95b70c91 100644 --- a/libc/config/gpu/api.td +++ b/libc/config/gpu/api.td @@ -59,11 +59,6 @@ def FenvAPI: PublicAPI<"fenv.h"> { } def StdIOAPI : PublicAPI<"stdio.h"> { - let Macros = [ - SimpleMacroDef<"_IOFBF", "0">, - SimpleMacroDef<"_IOLBF", "1">, - SimpleMacroDef<"_IONBF", "2">, - ]; let Types = [ "FILE", "off_t", diff --git a/libc/config/linux/api.td b/libc/config/linux/api.td index eb0090c80b0da3..60e9b70f0d8a41 100644 --- a/libc/config/linux/api.td +++ b/libc/config/linux/api.td @@ -76,9 +76,6 @@ def StdIOAPI : PublicAPI<"stdio.h"> { SimpleMacroDef<"stderr", "stderr">, SimpleMacroDef<"stdin", "stdin">, SimpleMacroDef<"stdout", "stdout">, - SimpleMacroDef<"_IOFBF", "0">, - SimpleMacroDef<"_IOLBF", "1">, - SimpleMacroDef<"_IONBF", "2">, ]; let Types = [ "FILE", diff --git a/libc/hdr/CMakeLists.txt b/libc/hdr/CMakeLists.txt index 1303280c2c5ef8..da640e8c0f70c6 100644 --- a/libc/hdr/CMakeLists.txt +++ b/libc/hdr/CMakeLists.txt @@ -69,6 +69,16 @@ add_proxy_header_library( libc.include.signal ) +add_proxy_header_library( + stdio_macros + HDRS + stdio_macros.h + FULL_BUILD_DEPENDS + libc.include.stdio + libc.include.llvm-libc-macros.stdio_macros + libc.include.llvm-libc-macros.file_seek_macros +) + add_proxy_header_library( sys_epoll_macros HDRS diff --git a/libc/hdr/stdio_macros.h b/libc/hdr/stdio_macros.h new file mode 100644 index 00000000000000..a212846dd8f411 --- /dev/null +++ b/libc/hdr/stdio_macros.h @@ -0,0 +1,23 @@ +//===-- Definition of macros from stdio.h --------------------------------===// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// + +#ifndef LLVM_LIBC_HDR_STDIO_MACROS_H +#define LLVM_LIBC_HDR_STDIO_MACROS_H + +#ifdef LIBC_FULL_BUILD + +#include "include/llvm-libc-macros/file-seek-macros.h" +#include "include/llvm-libc-macros/stdio-macros.h" + +#else // Overlay mode + +#include + +#endif // LLVM_LIBC_FULL_BUILD + +#endif // LLVM_LIBC_HDR_STDIO_MACROS_H diff --git a/libc/hdr/types/CMakeLists.txt b/libc/hdr/types/CMakeLists.txt index 1cab1d3b812cf0..4fc28fd82e68db 100644 --- a/libc/hdr/types/CMakeLists.txt +++ b/libc/hdr/types/CMakeLists.txt @@ -135,3 +135,30 @@ add_proxy_header_library( libc.include.llvm-libc-types.struct_sigaction libc.include.signal ) + +add_proxy_header_library( + FILE + HDRS + FILE.h + FULL_BUILD_DEPENDS + libc.include.llvm-libc-types.FILE + libc.include.stdio +) + +add_proxy_header_library( + off_t + HDRS + off_t.h + FULL_BUILD_DEPENDS + libc.include.llvm-libc-types.off_t + libc.include.stdio +) + +add_proxy_header_library( + cookie_io_functions_t + HDRS + cookie_io_functions_t.h + FULL_BUILD_DEPENDS + libc.include.llvm-libc-types.cookie_io_functions_t + libc.include.stdio +) diff --git a/libc/hdr/types/FILE.h b/libc/hdr/types/FILE.h new file mode 100644 index 00000000000000..60e95f07e37f91 --- /dev/null +++ b/libc/hdr/types/FILE.h @@ -0,0 +1,22 @@ +//===-- Proxy for FILE ----------------------------------------------------===// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// + +#ifndef LLVM_LIBC_HDR_TYPES_FILE_H +#define LLVM_LIBC_HDR_TYPES_FILE_H + +#ifdef LIBC_FULL_BUILD + +#include "include/llvm-libc-types/FILE.h" + +#else // Overlay mode + +#include + +#endif // LLVM_LIBC_FULL_BUILD + +#endif // LLVM_LIBC_HDR_TYPES_FILE_H diff --git a/libc/hdr/types/cookie_io_functions_t.h b/libc/hdr/types/cookie_io_functions_t.h new file mode 100644 index 00000000000000..d8fe7731a84bda --- /dev/null +++ b/libc/hdr/types/cookie_io_functions_t.h @@ -0,0 +1,22 @@ +//===-- Proxy for cookie_io_functions_t -----------------------------------===// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// + +#ifndef LLVM_LIBC_HDR_TYPES_COOKIE_IO_FUNCTIONS_T_H +#define LLVM_LIBC_HDR_TYPES_COOKIE_IO_FUNCTIONS_T_H + +#ifdef LIBC_FULL_BUILD + +#include "include/llvm-libc-types/cookie_io_functions_t.h" + +#else // Overlay mode + +#include + +#endif // LLVM_LIBC_FULL_BUILD + +#endif // LLVM_LIBC_HDR_TYPES_COOKIE_IO_FUNCTIONS_T_H diff --git a/libc/hdr/types/off_t.h b/libc/hdr/types/off_t.h new file mode 100644 index 00000000000000..abc3aa659365f7 --- /dev/null +++ b/libc/hdr/types/off_t.h @@ -0,0 +1,22 @@ +//===-- Proxy for off_t ---------------------------------------------------===// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// + +#ifndef LLVM_LIBC_HDR_TYPES_OFF_T_H +#define LLVM_LIBC_HDR_TYPES_OFF_T_H + +#ifdef LIBC_FULL_BUILD + +#include "include/llvm-libc-types/off_t.h" + +#else // Overlay mode + +#include + +#endif // LLVM_LIBC_FULL_BUILD + +#endif // LLVM_LIBC_HDR_TYPES_OFF_T_H diff --git a/libc/include/llvm-libc-macros/stdio-macros.h b/libc/include/llvm-libc-macros/stdio-macros.h index 4664801c5731f0..69fb71ad3f6515 100644 --- a/libc/include/llvm-libc-macros/stdio-macros.h +++ b/libc/include/llvm-libc-macros/stdio-macros.h @@ -15,4 +15,8 @@ #define BUFSIZ 1024 +#define _IONBF 2 +#define _IOLBF 1 +#define _IOFBF 0 + #endif // LLVM_LIBC_MACROS_STDIO_MACROS_H diff --git a/libc/newhdrgen/yaml/stdio.yaml b/libc/newhdrgen/yaml/stdio.yaml index 6d2a8557f9b94d..687a6d696cad60 100644 --- a/libc/newhdrgen/yaml/stdio.yaml +++ b/libc/newhdrgen/yaml/stdio.yaml @@ -1,11 +1,5 @@ header: stdio.h macros: - - macro_name: _IONBF - macro_value: 2 - - macro_name: _IOLBF - macro_value: 1 - - macro_name: _IOFBF - macro_value: 0 - macro_name: stdout macro_value: stdout - macro_name: stdin diff --git a/libc/src/__support/File/CMakeLists.txt b/libc/src/__support/File/CMakeLists.txt index 0416ac2cc902e7..1b390a12424d04 100644 --- a/libc/src/__support/File/CMakeLists.txt +++ b/libc/src/__support/File/CMakeLists.txt @@ -16,6 +16,8 @@ add_object_library( libc.src.__support.CPP.span libc.src.__support.threads.mutex libc.src.__support.error_or + libc.hdr.types.off_t + libc.hdr.stdio_macros ) add_object_library( diff --git a/libc/src/__support/File/file.cpp b/libc/src/__support/File/file.cpp index 0b1a8cac21f77f..08052f8d0a3283 100644 --- a/libc/src/__support/File/file.cpp +++ b/libc/src/__support/File/file.cpp @@ -8,13 +8,12 @@ #include "file.h" +#include "hdr/stdio_macros.h" +#include "hdr/types/off_t.h" #include "src/__support/CPP/new.h" #include "src/__support/CPP/span.h" #include "src/errno/libc_errno.h" // For error macros -#include -#include - namespace LIBC_NAMESPACE { FileIOResult File::write_unlocked(const void *data, size_t len) { diff --git a/libc/src/__support/File/file.h b/libc/src/__support/File/file.h index cc82a7ecc97453..d804289702540c 100644 --- a/libc/src/__support/File/file.h +++ b/libc/src/__support/File/file.h @@ -9,7 +9,8 @@ #ifndef LLVM_LIBC_SRC___SUPPORT_FILE_FILE_H #define LLVM_LIBC_SRC___SUPPORT_FILE_FILE_H -#include "include/llvm-libc-types/off_t.h" +#include "hdr/stdio_macros.h" +#include "hdr/types/off_t.h" #include "src/__support/CPP/new.h" #include "src/__support/error_or.h" #include "src/__support/macros/properties/architectures.h" diff --git a/libc/src/__support/File/linux/CMakeLists.txt b/libc/src/__support/File/linux/CMakeLists.txt index 8436a687116bd9..5556b812596f83 100644 --- a/libc/src/__support/File/linux/CMakeLists.txt +++ b/libc/src/__support/File/linux/CMakeLists.txt @@ -5,6 +5,7 @@ add_object_library( file.cpp HDRS file.h + lseekImpl.h DEPENDS libc.include.fcntl libc.include.stdio @@ -15,6 +16,9 @@ add_object_library( libc.src.errno.errno libc.src.__support.error_or libc.src.__support.File.file + libc.hdr.types.off_t + libc.hdr.types.FILE + libc.hdr.stdio_macros ) add_object_library( @@ -23,6 +27,8 @@ add_object_library( stdout.cpp DEPENDS .file + libc.hdr.types.FILE + libc.hdr.stdio_macros ) add_object_library( @@ -31,6 +37,8 @@ add_object_library( stdin.cpp DEPENDS .file + libc.hdr.types.FILE + libc.hdr.stdio_macros ) add_object_library( @@ -39,6 +47,8 @@ add_object_library( stderr.cpp DEPENDS .file + libc.hdr.types.FILE + libc.hdr.stdio_macros ) add_object_library( diff --git a/libc/src/__support/File/linux/file.cpp b/libc/src/__support/File/linux/file.cpp index 0f6ed4f0a5ef49..df68570bc10435 100644 --- a/libc/src/__support/File/linux/file.cpp +++ b/libc/src/__support/File/linux/file.cpp @@ -8,6 +8,8 @@ #include "file.h" +#include "hdr/stdio_macros.h" +#include "hdr/types/off_t.h" #include "src/__support/CPP/new.h" #include "src/__support/File/file.h" #include "src/__support/File/linux/lseekImpl.h" @@ -15,8 +17,7 @@ #include "src/__support/OSUtil/syscall.h" // For internal syscall function. #include "src/errno/libc_errno.h" // For error macros -#include // For mode_t and other flags to the open syscall -#include +#include // For mode_t and other flags to the open syscall #include // For S_IS*, S_IF*, and S_IR* flags. #include // For syscall numbers diff --git a/libc/src/__support/File/linux/file.h b/libc/src/__support/File/linux/file.h index 63b820529932b8..0507109e6793fc 100644 --- a/libc/src/__support/File/linux/file.h +++ b/libc/src/__support/File/linux/file.h @@ -6,6 +6,7 @@ // //===----------------------------------------------------------------------===// +#include "hdr/types/off_t.h" #include "src/__support/File/file.h" namespace LIBC_NAMESPACE { diff --git a/libc/src/__support/File/linux/lseekImpl.h b/libc/src/__support/File/linux/lseekImpl.h index d1632b703d3bc3..af015a2fd6a700 100644 --- a/libc/src/__support/File/linux/lseekImpl.h +++ b/libc/src/__support/File/linux/lseekImpl.h @@ -9,6 +9,7 @@ #ifndef LLVM_LIBC_SRC___SUPPORT_FILE_LINUX_LSEEKIMPL_H #define LLVM_LIBC_SRC___SUPPORT_FILE_LINUX_LSEEKIMPL_H +#include "hdr/types/off_t.h" #include "src/__support/OSUtil/syscall.h" // For internal syscall function. #include "src/__support/common.h" #include "src/__support/error_or.h" @@ -16,7 +17,6 @@ #include // For uint64_t. #include // For syscall numbers. -#include // For off_t. namespace LIBC_NAMESPACE { namespace internal { diff --git a/libc/src/__support/File/linux/stderr.cpp b/libc/src/__support/File/linux/stderr.cpp index 65d7865720ffe1..0b4b207329fffb 100644 --- a/libc/src/__support/File/linux/stderr.cpp +++ b/libc/src/__support/File/linux/stderr.cpp @@ -7,7 +7,8 @@ //===----------------------------------------------------------------------===// #include "file.h" -#include +#include "hdr/stdio_macros.h" +#include "hdr/types/FILE.h" namespace LIBC_NAMESPACE { diff --git a/libc/src/__support/File/linux/stdin.cpp b/libc/src/__support/File/linux/stdin.cpp index c9a363bb7c65ae..49146dacfd4ac0 100644 --- a/libc/src/__support/File/linux/stdin.cpp +++ b/libc/src/__support/File/linux/stdin.cpp @@ -7,7 +7,8 @@ //===----------------------------------------------------------------------===// #include "file.h" -#include +#include "hdr/stdio_macros.h" +#include "hdr/types/FILE.h" namespace LIBC_NAMESPACE { diff --git a/libc/src/__support/File/linux/stdout.cpp b/libc/src/__support/File/linux/stdout.cpp index 314692ecbfe1e4..58caf85b5167f9 100644 --- a/libc/src/__support/File/linux/stdout.cpp +++ b/libc/src/__support/File/linux/stdout.cpp @@ -7,7 +7,8 @@ //===----------------------------------------------------------------------===// #include "file.h" -#include +#include "hdr/stdio_macros.h" +#include "hdr/types/FILE.h" namespace LIBC_NAMESPACE { diff --git a/libc/src/__support/OSUtil/linux/CMakeLists.txt b/libc/src/__support/OSUtil/linux/CMakeLists.txt index 78b117fd194399..089cad454d534d 100644 --- a/libc/src/__support/OSUtil/linux/CMakeLists.txt +++ b/libc/src/__support/OSUtil/linux/CMakeLists.txt @@ -21,4 +21,5 @@ add_object_library( libc.hdr.types.struct_flock libc.hdr.types.struct_flock64 libc.hdr.types.struct_f_owner_ex + libc.hdr.types.off_t ) diff --git a/libc/src/__support/OSUtil/linux/fcntl.cpp b/libc/src/__support/OSUtil/linux/fcntl.cpp index b6483bb7534d60..d5e850a9047035 100644 --- a/libc/src/__support/OSUtil/linux/fcntl.cpp +++ b/libc/src/__support/OSUtil/linux/fcntl.cpp @@ -9,6 +9,7 @@ #include "src/__support/OSUtil/fcntl.h" #include "hdr/fcntl_macros.h" +#include "hdr/types/off_t.h" #include "hdr/types/struct_f_owner_ex.h" #include "hdr/types/struct_flock.h" #include "hdr/types/struct_flock64.h" diff --git a/libc/src/gpu/rpc_fprintf.h b/libc/src/gpu/rpc_fprintf.h index 053f7b4f818ae8..3292ce2d4b1ec2 100644 --- a/libc/src/gpu/rpc_fprintf.h +++ b/libc/src/gpu/rpc_fprintf.h @@ -9,8 +9,8 @@ #ifndef LLVM_LIBC_SRC_GPU_RPC_HOST_CALL_H #define LLVM_LIBC_SRC_GPU_RPC_HOST_CALL_H +#include "hdr/types/FILE.h" #include -#include namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/CMakeLists.txt b/libc/src/stdio/CMakeLists.txt index a659d9e847a9ef..91b3a864042b99 100644 --- a/libc/src/stdio/CMakeLists.txt +++ b/libc/src/stdio/CMakeLists.txt @@ -37,7 +37,7 @@ add_entrypoint_object( HDRS flockfile.h DEPENDS - libc.include.stdio + libc.hdr.types.FILE libc.src.__support.File.file libc.src.__support.File.platform_file ) @@ -49,7 +49,7 @@ add_entrypoint_object( HDRS funlockfile.h DEPENDS - libc.include.stdio + libc.hdr.types.FILE libc.src.__support.File.file libc.src.__support.File.platform_file ) @@ -61,7 +61,10 @@ add_entrypoint_object( HDRS fopencookie.h DEPENDS - libc.include.stdio + libc.hdr.stdio_macros + libc.hdr.types.off_t + libc.hdr.types.cookie_io_functions_t + libc.hdr.types.FILE libc.src.__support.CPP.new libc.src.__support.File.file ) @@ -74,7 +77,7 @@ add_entrypoint_object( setbuf.h DEPENDS libc.src.errno.errno - libc.include.stdio + libc.hdr.types.off_t libc.src.__support.File.file libc.src.__support.File.platform_file ) @@ -87,7 +90,7 @@ add_entrypoint_object( setvbuf.h DEPENDS libc.src.errno.errno - libc.include.stdio + libc.hdr.types.FILE libc.src.__support.File.file libc.src.__support.File.platform_file ) @@ -95,6 +98,7 @@ add_entrypoint_object( list(APPEND scanf_deps libc.src.__support.arg_list libc.src.stdio.scanf_core.vfscanf_internal + libc.hdr.types.FILE ) if(LLVM_LIBC_FULL_BUILD) @@ -166,6 +170,7 @@ add_entrypoint_object( HDRS fprintf.h DEPENDS + libc.hdr.types.FILE libc.src.__support.arg_list libc.src.stdio.printf_core.vfprintf_internal ) @@ -199,6 +204,7 @@ add_entrypoint_object( HDRS vfprintf.h DEPENDS + libc.hdr.types.FILE libc.src.__support.arg_list libc.src.stdio.printf_core.vfprintf_internal ) diff --git a/libc/src/stdio/baremetal/getchar.cpp b/libc/src/stdio/baremetal/getchar.cpp index bbd5ba7a954fb5..0cd7c59b495ddd 100644 --- a/libc/src/stdio/baremetal/getchar.cpp +++ b/libc/src/stdio/baremetal/getchar.cpp @@ -9,7 +9,7 @@ #include "src/stdio/getchar.h" #include "src/__support/OSUtil/io.h" -#include +#include "hdr/types/FILE.h" namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/baremetal/printf.cpp b/libc/src/stdio/baremetal/printf.cpp index b240371a0c20e5..dfc3c0b8539593 100644 --- a/libc/src/stdio/baremetal/printf.cpp +++ b/libc/src/stdio/baremetal/printf.cpp @@ -14,6 +14,7 @@ #include "src/stdio/printf_core/writer.h" #include +#include namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/baremetal/vprintf.cpp b/libc/src/stdio/baremetal/vprintf.cpp index cd1541297f3b6b..203ec18efb6579 100644 --- a/libc/src/stdio/baremetal/vprintf.cpp +++ b/libc/src/stdio/baremetal/vprintf.cpp @@ -14,6 +14,7 @@ #include "src/stdio/printf_core/writer.h" #include +#include namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/clearerr.h b/libc/src/stdio/clearerr.h index b8e8d7c5cab82c..2b3418037c4338 100644 --- a/libc/src/stdio/clearerr.h +++ b/libc/src/stdio/clearerr.h @@ -9,7 +9,7 @@ #ifndef LLVM_LIBC_SRC_STDIO_CLEARERR_H #define LLVM_LIBC_SRC_STDIO_CLEARERR_H -#include +#include "hdr/types/FILE.h" namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/clearerr_unlocked.h b/libc/src/stdio/clearerr_unlocked.h index ff447cea61370c..05ddbdd1d7af1c 100644 --- a/libc/src/stdio/clearerr_unlocked.h +++ b/libc/src/stdio/clearerr_unlocked.h @@ -9,7 +9,7 @@ #ifndef LLVM_LIBC_SRC_STDIO_CLEARERR_UNLOCKED_H #define LLVM_LIBC_SRC_STDIO_CLEARERR_UNLOCKED_H -#include +#include "hdr/types/FILE.h" namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/fclose.h b/libc/src/stdio/fclose.h index 7fe6951a080dca..731e3581d8fd13 100644 --- a/libc/src/stdio/fclose.h +++ b/libc/src/stdio/fclose.h @@ -9,7 +9,7 @@ #ifndef LLVM_LIBC_SRC_STDIO_FCLOSE_H #define LLVM_LIBC_SRC_STDIO_FCLOSE_H -#include +#include "hdr/types/FILE.h" namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/fdopen.h b/libc/src/stdio/fdopen.h index 158a133e7e1317..29028b8ab5ed39 100644 --- a/libc/src/stdio/fdopen.h +++ b/libc/src/stdio/fdopen.h @@ -9,11 +9,11 @@ #ifndef LLVM_LIBC_SRC_STDIO_FDOPEN_H #define LLVM_LIBC_SRC_STDIO_FDOPEN_H -#include +#include "hdr/types/FILE.h" namespace LIBC_NAMESPACE { -FILE *fdopen(int fd, const char *mode); +::FILE *fdopen(int fd, const char *mode); } // namespace LIBC_NAMESPACE diff --git a/libc/src/stdio/feof.h b/libc/src/stdio/feof.h index 66a49bdd257015..3d47db6993e1f0 100644 --- a/libc/src/stdio/feof.h +++ b/libc/src/stdio/feof.h @@ -9,7 +9,7 @@ #ifndef LLVM_LIBC_SRC_STDIO_FEOF_H #define LLVM_LIBC_SRC_STDIO_FEOF_H -#include +#include "hdr/types/FILE.h" namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/feof_unlocked.h b/libc/src/stdio/feof_unlocked.h index 359609c597900b..6eae4279926983 100644 --- a/libc/src/stdio/feof_unlocked.h +++ b/libc/src/stdio/feof_unlocked.h @@ -9,7 +9,7 @@ #ifndef LLVM_LIBC_SRC_STDIO_FEOF_UNLOCKED_H #define LLVM_LIBC_SRC_STDIO_FEOF_UNLOCKED_H -#include +#include "hdr/types/FILE.h" namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/ferror.h b/libc/src/stdio/ferror.h index 194dff6320c838..9e2f949bf30e5f 100644 --- a/libc/src/stdio/ferror.h +++ b/libc/src/stdio/ferror.h @@ -9,7 +9,7 @@ #ifndef LLVM_LIBC_SRC_STDIO_FERROR_H #define LLVM_LIBC_SRC_STDIO_FERROR_H -#include +#include "hdr/types/FILE.h" namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/ferror_unlocked.h b/libc/src/stdio/ferror_unlocked.h index 86281025368c36..16cfd5a1b1482b 100644 --- a/libc/src/stdio/ferror_unlocked.h +++ b/libc/src/stdio/ferror_unlocked.h @@ -9,7 +9,7 @@ #ifndef LLVM_LIBC_SRC_STDIO_FERROR_UNLOCKED_H #define LLVM_LIBC_SRC_STDIO_FERROR_UNLOCKED_H -#include +#include "hdr/types/FILE.h" namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/fflush.h b/libc/src/stdio/fflush.h index 839fd986f15b54..d64d5264cf7dd4 100644 --- a/libc/src/stdio/fflush.h +++ b/libc/src/stdio/fflush.h @@ -9,7 +9,7 @@ #ifndef LLVM_LIBC_SRC_STDIO_FFLUSH_H #define LLVM_LIBC_SRC_STDIO_FFLUSH_H -#include +#include "hdr/types/FILE.h" namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/fgetc.h b/libc/src/stdio/fgetc.h index 26a32482a3ba78..f88d759d549ec1 100644 --- a/libc/src/stdio/fgetc.h +++ b/libc/src/stdio/fgetc.h @@ -9,7 +9,7 @@ #ifndef LLVM_LIBC_SRC_STDIO_FGETC_H #define LLVM_LIBC_SRC_STDIO_FGETC_H -#include +#include "hdr/types/FILE.h" namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/fgetc_unlocked.h b/libc/src/stdio/fgetc_unlocked.h index f765e8d502be79..9ff311af833e4d 100644 --- a/libc/src/stdio/fgetc_unlocked.h +++ b/libc/src/stdio/fgetc_unlocked.h @@ -9,7 +9,7 @@ #ifndef LLVM_LIBC_SRC_STDIO_FGETC_UNLOCKED_H #define LLVM_LIBC_SRC_STDIO_FGETC_UNLOCKED_H -#include +#include "hdr/types/FILE.h" namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/fgets.h b/libc/src/stdio/fgets.h index 42645578624793..d3d49a1f429527 100644 --- a/libc/src/stdio/fgets.h +++ b/libc/src/stdio/fgets.h @@ -9,7 +9,7 @@ #ifndef LLVM_LIBC_SRC_STDIO_FGETS_H #define LLVM_LIBC_SRC_STDIO_FGETS_H -#include +#include "hdr/types/FILE.h" namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/flockfile.cpp b/libc/src/stdio/flockfile.cpp index 62606c92b9ea93..b996a77b3c300d 100644 --- a/libc/src/stdio/flockfile.cpp +++ b/libc/src/stdio/flockfile.cpp @@ -9,7 +9,7 @@ #include "src/stdio/flockfile.h" #include "src/__support/File/file.h" -#include +#include "hdr/types/FILE.h" namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/flockfile.h b/libc/src/stdio/flockfile.h index 1509c140c5e711..ef002657a2416a 100644 --- a/libc/src/stdio/flockfile.h +++ b/libc/src/stdio/flockfile.h @@ -9,7 +9,7 @@ #ifndef LLVM_LIBC_SRC_STDIO_FLOCKFILE_H #define LLVM_LIBC_SRC_STDIO_FLOCKFILE_H -#include +#include "hdr/types/FILE.h" namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/fopen.h b/libc/src/stdio/fopen.h index 68f93f5168f079..23f95cfe592e6f 100644 --- a/libc/src/stdio/fopen.h +++ b/libc/src/stdio/fopen.h @@ -9,7 +9,7 @@ #ifndef LLVM_LIBC_SRC_STDIO_FOPEN_H #define LLVM_LIBC_SRC_STDIO_FOPEN_H -#include +#include "hdr/types/FILE.h" namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/fopencookie.cpp b/libc/src/stdio/fopencookie.cpp index 17b8ae199d3db3..367172a6fd8c74 100644 --- a/libc/src/stdio/fopencookie.cpp +++ b/libc/src/stdio/fopencookie.cpp @@ -7,12 +7,14 @@ //===----------------------------------------------------------------------===// #include "src/stdio/fopencookie.h" +#include "hdr/stdio_macros.h" +#include "hdr/types/FILE.h" +#include "hdr/types/cookie_io_functions_t.h" +#include "hdr/types/off_t.h" #include "src/__support/CPP/new.h" #include "src/__support/File/file.h" #include "src/errno/libc_errno.h" -#include -#include namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/fopencookie.h b/libc/src/stdio/fopencookie.h index 3dff8949dd4351..dc832128a30d04 100644 --- a/libc/src/stdio/fopencookie.h +++ b/libc/src/stdio/fopencookie.h @@ -9,7 +9,8 @@ #ifndef LLVM_LIBC_SRC_STDIO_FOPENCOOKIE_H #define LLVM_LIBC_SRC_STDIO_FOPENCOOKIE_H -#include +#include "hdr/types/FILE.h" +#include "hdr/types/cookie_io_functions_t.h" namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/fprintf.cpp b/libc/src/stdio/fprintf.cpp index 87b0e74ae09bfb..5d14d82b77df79 100644 --- a/libc/src/stdio/fprintf.cpp +++ b/libc/src/stdio/fprintf.cpp @@ -12,8 +12,8 @@ #include "src/__support/arg_list.h" #include "src/stdio/printf_core/vfprintf_internal.h" +#include "hdr/types/FILE.h" #include -#include namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/fprintf.h b/libc/src/stdio/fprintf.h index 41cd8a858b430c..4d070cec7d291b 100644 --- a/libc/src/stdio/fprintf.h +++ b/libc/src/stdio/fprintf.h @@ -9,7 +9,7 @@ #ifndef LLVM_LIBC_SRC_STDIO_FPRINTF_H #define LLVM_LIBC_SRC_STDIO_FPRINTF_H -#include +#include "hdr/types/FILE.h" namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/fputc.h b/libc/src/stdio/fputc.h index 578e569072a1f2..6c449650d3c1e6 100644 --- a/libc/src/stdio/fputc.h +++ b/libc/src/stdio/fputc.h @@ -9,7 +9,7 @@ #ifndef LLVM_LIBC_SRC_STDIO_FPUTC_H #define LLVM_LIBC_SRC_STDIO_FPUTC_H -#include +#include "hdr/types/FILE.h" namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/fputs.h b/libc/src/stdio/fputs.h index 0238e46e628a61..4dddf96eab27e8 100644 --- a/libc/src/stdio/fputs.h +++ b/libc/src/stdio/fputs.h @@ -9,7 +9,7 @@ #ifndef LLVM_LIBC_SRC_STDIO_FPUTS_H #define LLVM_LIBC_SRC_STDIO_FPUTS_H -#include +#include "hdr/types/FILE.h" namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/fread.h b/libc/src/stdio/fread.h index ae2295095b9cf5..a74095aafff915 100644 --- a/libc/src/stdio/fread.h +++ b/libc/src/stdio/fread.h @@ -9,7 +9,8 @@ #ifndef LLVM_LIBC_SRC_STDIO_FREAD_H #define LLVM_LIBC_SRC_STDIO_FREAD_H -#include +#include "hdr/types/FILE.h" +#include namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/fread_unlocked.h b/libc/src/stdio/fread_unlocked.h index 7cd0ed3e35c577..49a3827608f3aa 100644 --- a/libc/src/stdio/fread_unlocked.h +++ b/libc/src/stdio/fread_unlocked.h @@ -9,7 +9,8 @@ #ifndef LLVM_LIBC_SRC_STDIO_FREAD_UNLOCKED_H #define LLVM_LIBC_SRC_STDIO_FREAD_UNLOCKED_H -#include +#include "hdr/types/FILE.h" +#include namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/fscanf.cpp b/libc/src/stdio/fscanf.cpp index 188e28e50d0bd7..1f99f873c0700c 100644 --- a/libc/src/stdio/fscanf.cpp +++ b/libc/src/stdio/fscanf.cpp @@ -12,8 +12,8 @@ #include "src/__support/arg_list.h" #include "src/stdio/scanf_core/vfscanf_internal.h" +#include "hdr/types/FILE.h" #include -#include namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/fscanf.h b/libc/src/stdio/fscanf.h index 0e2247d74f0e57..21df616783bb38 100644 --- a/libc/src/stdio/fscanf.h +++ b/libc/src/stdio/fscanf.h @@ -9,7 +9,7 @@ #ifndef LLVM_LIBC_SRC_STDIO_FSCANF_H #define LLVM_LIBC_SRC_STDIO_FSCANF_H -#include +#include "hdr/types/FILE.h" namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/fseek.h b/libc/src/stdio/fseek.h index 6a7f715d2f9989..5496cbef4b2f49 100644 --- a/libc/src/stdio/fseek.h +++ b/libc/src/stdio/fseek.h @@ -9,7 +9,7 @@ #ifndef LLVM_LIBC_SRC_STDIO_FSEEK_H #define LLVM_LIBC_SRC_STDIO_FSEEK_H -#include +#include "hdr/types/FILE.h" namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/fseeko.h b/libc/src/stdio/fseeko.h index 77fb41215c318f..25fc39e561397b 100644 --- a/libc/src/stdio/fseeko.h +++ b/libc/src/stdio/fseeko.h @@ -9,7 +9,8 @@ #ifndef LLVM_LIBC_SRC_STDIO_FSEEKO_H #define LLVM_LIBC_SRC_STDIO_FSEEKO_H -#include +#include "hdr/types/FILE.h" +#include "hdr/types/off_t.h" namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/ftell.h b/libc/src/stdio/ftell.h index e72bb8b32bd947..b644edd70181cb 100644 --- a/libc/src/stdio/ftell.h +++ b/libc/src/stdio/ftell.h @@ -9,7 +9,7 @@ #ifndef LLVM_LIBC_SRC_STDIO_FTELL_H #define LLVM_LIBC_SRC_STDIO_FTELL_H -#include +#include "hdr/types/FILE.h" namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/ftello.h b/libc/src/stdio/ftello.h index 5ab17f9244a5ad..fc00b6a3e05166 100644 --- a/libc/src/stdio/ftello.h +++ b/libc/src/stdio/ftello.h @@ -9,7 +9,8 @@ #ifndef LLVM_LIBC_SRC_STDIO_FTELLO_H #define LLVM_LIBC_SRC_STDIO_FTELLO_H -#include +#include "hdr/types/FILE.h" +#include "hdr/types/off_t.h" namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/funlockfile.cpp b/libc/src/stdio/funlockfile.cpp index 88e2eaef8ba038..404b2324efd15e 100644 --- a/libc/src/stdio/funlockfile.cpp +++ b/libc/src/stdio/funlockfile.cpp @@ -9,7 +9,7 @@ #include "src/stdio/funlockfile.h" #include "src/__support/File/file.h" -#include +#include "hdr/types/FILE.h" namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/funlockfile.h b/libc/src/stdio/funlockfile.h index c50f9dd1d70099..65b77ddfc711e2 100644 --- a/libc/src/stdio/funlockfile.h +++ b/libc/src/stdio/funlockfile.h @@ -9,7 +9,7 @@ #ifndef LLVM_LIBC_SRC_STDIO_FUNLOCKFILE_H #define LLVM_LIBC_SRC_STDIO_FUNLOCKFILE_H -#include +#include "hdr/types/FILE.h" namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/fwrite.h b/libc/src/stdio/fwrite.h index a71f20cff023ac..c1532984582d1e 100644 --- a/libc/src/stdio/fwrite.h +++ b/libc/src/stdio/fwrite.h @@ -9,7 +9,8 @@ #ifndef LLVM_LIBC_SRC_STDIO_FWRITE_H #define LLVM_LIBC_SRC_STDIO_FWRITE_H -#include +#include "hdr/types/FILE.h" +#include namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/fwrite_unlocked.h b/libc/src/stdio/fwrite_unlocked.h index 7012e0d16737a9..c1a02af807b08d 100644 --- a/libc/src/stdio/fwrite_unlocked.h +++ b/libc/src/stdio/fwrite_unlocked.h @@ -9,7 +9,8 @@ #ifndef LLVM_LIBC_SRC_STDIO_FWRITE_UNLOCKED_H #define LLVM_LIBC_SRC_STDIO_FWRITE_UNLOCKED_H -#include +#include "hdr/types/FILE.h" +#include namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/generic/CMakeLists.txt b/libc/src/stdio/generic/CMakeLists.txt index 9cd4cfdae17f4c..b0ce8ccc08bd65 100644 --- a/libc/src/stdio/generic/CMakeLists.txt +++ b/libc/src/stdio/generic/CMakeLists.txt @@ -5,7 +5,7 @@ add_entrypoint_object( HDRS ../clearerr.h DEPENDS - libc.include.stdio + libc.hdr.types.FILE libc.src.__support.File.file libc.src.__support.File.platform_file ) @@ -17,7 +17,7 @@ add_entrypoint_object( HDRS ../clearerr_unlocked.h DEPENDS - libc.include.stdio + libc.hdr.types.FILE libc.src.__support.File.file libc.src.__support.File.platform_file ) @@ -29,7 +29,7 @@ add_entrypoint_object( HDRS ../feof.h DEPENDS - libc.include.stdio + libc.hdr.types.FILE libc.src.__support.File.file libc.src.__support.File.platform_file ) @@ -41,7 +41,7 @@ add_entrypoint_object( HDRS ../feof_unlocked.h DEPENDS - libc.include.stdio + libc.hdr.types.FILE libc.src.__support.File.file libc.src.__support.File.platform_file ) @@ -53,7 +53,7 @@ add_entrypoint_object( HDRS ../ferror.h DEPENDS - libc.include.stdio + libc.hdr.types.FILE libc.src.__support.File.file libc.src.__support.File.platform_file ) @@ -65,7 +65,7 @@ add_entrypoint_object( HDRS ../ferror_unlocked.h DEPENDS - libc.include.stdio + libc.hdr.types.FILE libc.src.__support.File.file libc.src.__support.File.platform_file ) @@ -77,7 +77,7 @@ add_entrypoint_object( HDRS ../fileno.h DEPENDS - libc.include.stdio + libc.hdr.types.FILE libc.src.__support.File.file libc.src.__support.File.platform_file ) @@ -90,7 +90,7 @@ add_entrypoint_object( ../fflush.h DEPENDS libc.src.errno.errno - libc.include.stdio + libc.hdr.types.FILE libc.src.__support.File.file libc.src.__support.File.platform_file ) @@ -150,7 +150,7 @@ add_entrypoint_object( HDRS ../fopen.h DEPENDS - libc.include.stdio + libc.hdr.types.FILE libc.src.__support.File.file libc.src.__support.File.platform_file ) @@ -162,7 +162,7 @@ add_entrypoint_object( HDRS ../fclose.h DEPENDS - libc.include.stdio + libc.hdr.types.FILE libc.src.errno.errno libc.src.__support.File.file libc.src.__support.File.platform_file @@ -176,7 +176,7 @@ add_entrypoint_object( ../fread_unlocked.h DEPENDS libc.src.errno.errno - libc.include.stdio + libc.hdr.types.FILE libc.src.__support.File.file libc.src.__support.File.platform_file ) @@ -189,7 +189,7 @@ add_entrypoint_object( ../fread.h DEPENDS libc.src.errno.errno - libc.include.stdio + libc.hdr.types.FILE libc.src.__support.File.file libc.src.__support.File.platform_file ) @@ -202,7 +202,7 @@ add_entrypoint_object( ../fputs.h DEPENDS libc.src.errno.errno - libc.include.stdio + libc.hdr.types.FILE libc.src.__support.File.file libc.src.__support.File.platform_file ) @@ -215,7 +215,7 @@ add_entrypoint_object( ../puts.h DEPENDS libc.src.errno.errno - libc.include.stdio + libc.hdr.types.FILE libc.src.__support.File.file libc.src.__support.File.platform_stdout ) @@ -228,7 +228,7 @@ add_entrypoint_object( ../fwrite_unlocked.h DEPENDS libc.src.errno.errno - libc.include.stdio + libc.hdr.types.FILE libc.src.__support.File.file libc.src.__support.File.platform_file ) @@ -241,7 +241,7 @@ add_entrypoint_object( ../fwrite.h DEPENDS libc.src.errno.errno - libc.include.stdio + libc.hdr.types.FILE libc.src.__support.File.file libc.src.__support.File.platform_file ) @@ -254,7 +254,7 @@ add_entrypoint_object( ../fputc.h DEPENDS libc.src.errno.errno - libc.include.stdio + libc.hdr.types.FILE libc.src.__support.File.file libc.src.__support.File.platform_file ) @@ -267,7 +267,7 @@ add_entrypoint_object( ../putc.h DEPENDS libc.src.errno.errno - libc.include.stdio + libc.hdr.types.FILE libc.src.__support.File.file libc.src.__support.File.platform_file ) @@ -280,7 +280,7 @@ add_entrypoint_object( ../putchar.h DEPENDS libc.src.errno.errno - libc.include.stdio + libc.hdr.types.FILE libc.src.__support.File.file libc.src.__support.File.platform_file ) @@ -293,7 +293,7 @@ add_entrypoint_object( ../fgetc.h DEPENDS libc.src.errno.errno - libc.include.stdio + libc.hdr.types.FILE libc.src.__support.File.file libc.src.__support.File.platform_file ) @@ -306,7 +306,7 @@ add_entrypoint_object( ../fgetc_unlocked.h DEPENDS libc.src.errno.errno - libc.include.stdio + libc.hdr.types.FILE libc.src.__support.File.file libc.src.__support.File.platform_file ) @@ -319,7 +319,7 @@ add_entrypoint_object( ../getc.h DEPENDS libc.src.errno.errno - libc.include.stdio + libc.hdr.types.FILE libc.src.__support.File.file libc.src.__support.File.platform_file ) @@ -332,7 +332,7 @@ add_entrypoint_object( ../getc_unlocked.h DEPENDS libc.src.errno.errno - libc.include.stdio + libc.hdr.types.FILE libc.src.__support.File.file libc.src.__support.File.platform_file ) @@ -345,7 +345,7 @@ add_entrypoint_object( ../getchar.h DEPENDS libc.src.errno.errno - libc.include.stdio + libc.hdr.types.FILE libc.src.__support.File.file libc.src.__support.File.platform_file ) @@ -358,7 +358,7 @@ add_entrypoint_object( ../getchar_unlocked.h DEPENDS libc.src.errno.errno - libc.include.stdio + libc.hdr.types.FILE libc.src.__support.File.file libc.src.__support.File.platform_file ) @@ -404,7 +404,7 @@ add_entrypoint_object( ../fgets.h DEPENDS libc.src.errno.errno - libc.include.stdio + libc.hdr.types.FILE libc.src.__support.File.file libc.src.__support.File.platform_file ) @@ -416,7 +416,7 @@ add_entrypoint_object( HDRS ../ungetc.h DEPENDS - libc.include.stdio + libc.hdr.types.FILE libc.src.__support.File.file libc.src.__support.File.platform_file ) @@ -428,7 +428,7 @@ add_entrypoint_object( HDRS ../stdin.h DEPENDS - libc.include.stdio + libc.hdr.types.FILE libc.src.__support.File.file libc.src.__support.File.platform_stdin ) @@ -440,7 +440,7 @@ add_entrypoint_object( HDRS ../stdout.h DEPENDS - libc.include.stdio + libc.hdr.types.FILE libc.src.__support.File.file libc.src.__support.File.platform_stdout ) @@ -452,7 +452,7 @@ add_entrypoint_object( HDRS ../stderr.h DEPENDS - libc.include.stdio + libc.hdr.types.FILE libc.src.__support.File.file libc.src.__support.File.platform_stderr ) diff --git a/libc/src/stdio/generic/clearerr.cpp b/libc/src/stdio/generic/clearerr.cpp index 1f1ce38639f50c..11a2da18473212 100644 --- a/libc/src/stdio/generic/clearerr.cpp +++ b/libc/src/stdio/generic/clearerr.cpp @@ -9,7 +9,7 @@ #include "src/stdio/clearerr.h" #include "src/__support/File/file.h" -#include +#include "hdr/types/FILE.h" namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/generic/clearerr_unlocked.cpp b/libc/src/stdio/generic/clearerr_unlocked.cpp index 2840e3703ca939..86caa7ba8a4c53 100644 --- a/libc/src/stdio/generic/clearerr_unlocked.cpp +++ b/libc/src/stdio/generic/clearerr_unlocked.cpp @@ -9,7 +9,7 @@ #include "src/stdio/clearerr_unlocked.h" #include "src/__support/File/file.h" -#include +#include "hdr/types/FILE.h" namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/generic/fclose.cpp b/libc/src/stdio/generic/fclose.cpp index cc163ab21e78d0..50ef17cf2a4a54 100644 --- a/libc/src/stdio/generic/fclose.cpp +++ b/libc/src/stdio/generic/fclose.cpp @@ -9,8 +9,8 @@ #include "src/stdio/fclose.h" #include "src/__support/File/file.h" +#include "hdr/types/FILE.h" #include "src/errno/libc_errno.h" -#include namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/generic/feof.cpp b/libc/src/stdio/generic/feof.cpp index 311561c4271f01..77df40e8bcfdf3 100644 --- a/libc/src/stdio/generic/feof.cpp +++ b/libc/src/stdio/generic/feof.cpp @@ -9,7 +9,7 @@ #include "src/stdio/feof.h" #include "src/__support/File/file.h" -#include +#include "hdr/types/FILE.h" namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/generic/feof_unlocked.cpp b/libc/src/stdio/generic/feof_unlocked.cpp index e8c718c1369613..0dcefafb6c2594 100644 --- a/libc/src/stdio/generic/feof_unlocked.cpp +++ b/libc/src/stdio/generic/feof_unlocked.cpp @@ -9,7 +9,7 @@ #include "src/stdio/feof_unlocked.h" #include "src/__support/File/file.h" -#include +#include "hdr/types/FILE.h" namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/generic/ferror.cpp b/libc/src/stdio/generic/ferror.cpp index 65cf99fe484730..66128fd6b7753a 100644 --- a/libc/src/stdio/generic/ferror.cpp +++ b/libc/src/stdio/generic/ferror.cpp @@ -9,7 +9,7 @@ #include "src/stdio/ferror.h" #include "src/__support/File/file.h" -#include +#include "hdr/types/FILE.h" namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/generic/ferror_unlocked.cpp b/libc/src/stdio/generic/ferror_unlocked.cpp index 089ea4ab36b576..76a4e2556dee3c 100644 --- a/libc/src/stdio/generic/ferror_unlocked.cpp +++ b/libc/src/stdio/generic/ferror_unlocked.cpp @@ -9,7 +9,7 @@ #include "src/stdio/ferror_unlocked.h" #include "src/__support/File/file.h" -#include +#include "hdr/types/FILE.h" namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/generic/fflush.cpp b/libc/src/stdio/generic/fflush.cpp index dc5275b1cd08e1..670dda03d54ebd 100644 --- a/libc/src/stdio/generic/fflush.cpp +++ b/libc/src/stdio/generic/fflush.cpp @@ -9,8 +9,8 @@ #include "src/stdio/fflush.h" #include "src/__support/File/file.h" +#include "hdr/types/FILE.h" #include "src/errno/libc_errno.h" -#include namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/generic/fgetc.cpp b/libc/src/stdio/generic/fgetc.cpp index 771811382fd595..66afa64875597a 100644 --- a/libc/src/stdio/generic/fgetc.cpp +++ b/libc/src/stdio/generic/fgetc.cpp @@ -9,8 +9,9 @@ #include "src/stdio/fgetc.h" #include "src/__support/File/file.h" +#include "hdr/types/FILE.h" #include "src/errno/libc_errno.h" -#include +#include namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/generic/fgetc_unlocked.cpp b/libc/src/stdio/generic/fgetc_unlocked.cpp index e7aaf9dc8ea223..7d67a94400ae91 100644 --- a/libc/src/stdio/generic/fgetc_unlocked.cpp +++ b/libc/src/stdio/generic/fgetc_unlocked.cpp @@ -9,8 +9,9 @@ #include "src/stdio/fgetc_unlocked.h" #include "src/__support/File/file.h" +#include "hdr/types/FILE.h" #include "src/errno/libc_errno.h" -#include +#include namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/generic/fgets.cpp b/libc/src/stdio/generic/fgets.cpp index 8c9dac8bd3b31f..121790bf7d1804 100644 --- a/libc/src/stdio/generic/fgets.cpp +++ b/libc/src/stdio/generic/fgets.cpp @@ -9,9 +9,9 @@ #include "src/stdio/fgets.h" #include "src/__support/File/file.h" +#include "hdr/types/FILE.h" #include "src/errno/libc_errno.h" #include -#include namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/generic/fopen.cpp b/libc/src/stdio/generic/fopen.cpp index 794ef0366dd669..19cf3bcd02f5ee 100644 --- a/libc/src/stdio/generic/fopen.cpp +++ b/libc/src/stdio/generic/fopen.cpp @@ -9,8 +9,8 @@ #include "src/stdio/fopen.h" #include "src/__support/File/file.h" +#include "hdr/types/FILE.h" #include "src/errno/libc_errno.h" -#include namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/generic/fputc.cpp b/libc/src/stdio/generic/fputc.cpp index ecbe45e97208d4..71d4bb8d5debba 100644 --- a/libc/src/stdio/generic/fputc.cpp +++ b/libc/src/stdio/generic/fputc.cpp @@ -9,8 +9,9 @@ #include "src/stdio/fputc.h" #include "src/__support/File/file.h" +#include "hdr/types/FILE.h" #include "src/errno/libc_errno.h" -#include +#include namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/generic/fputs.cpp b/libc/src/stdio/generic/fputs.cpp index ef77ad43a1b427..cefc6c68137502 100644 --- a/libc/src/stdio/generic/fputs.cpp +++ b/libc/src/stdio/generic/fputs.cpp @@ -10,8 +10,9 @@ #include "src/__support/CPP/string_view.h" #include "src/__support/File/file.h" +#include "hdr/types/FILE.h" #include "src/errno/libc_errno.h" -#include +#include namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/generic/fread.cpp b/libc/src/stdio/generic/fread.cpp index e8bd2517df6f80..986828b86b340a 100644 --- a/libc/src/stdio/generic/fread.cpp +++ b/libc/src/stdio/generic/fread.cpp @@ -9,8 +9,9 @@ #include "src/stdio/fread.h" #include "src/__support/File/file.h" +#include "hdr/types/FILE.h" #include "src/errno/libc_errno.h" -#include +#include namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/generic/fread_unlocked.cpp b/libc/src/stdio/generic/fread_unlocked.cpp index 9810c9d6519d9c..072503d0502ecf 100644 --- a/libc/src/stdio/generic/fread_unlocked.cpp +++ b/libc/src/stdio/generic/fread_unlocked.cpp @@ -9,8 +9,9 @@ #include "src/stdio/fread_unlocked.h" #include "src/__support/File/file.h" +#include "hdr/types/FILE.h" #include "src/errno/libc_errno.h" -#include +#include namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/generic/fwrite.cpp b/libc/src/stdio/generic/fwrite.cpp index bd11f62a7121c5..14c14f5e1a9810 100644 --- a/libc/src/stdio/generic/fwrite.cpp +++ b/libc/src/stdio/generic/fwrite.cpp @@ -9,8 +9,9 @@ #include "src/stdio/fwrite.h" #include "src/__support/File/file.h" +#include "hdr/types/FILE.h" #include "src/errno/libc_errno.h" -#include +#include namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/generic/fwrite_unlocked.cpp b/libc/src/stdio/generic/fwrite_unlocked.cpp index 5ab7c766087b7b..0c76bd13d995a3 100644 --- a/libc/src/stdio/generic/fwrite_unlocked.cpp +++ b/libc/src/stdio/generic/fwrite_unlocked.cpp @@ -9,8 +9,9 @@ #include "src/stdio/fwrite_unlocked.h" #include "src/__support/File/file.h" +#include "hdr/types/FILE.h" #include "src/errno/libc_errno.h" -#include +#include namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/generic/getc.cpp b/libc/src/stdio/generic/getc.cpp index 5cea28d506f6bc..20f39479d31003 100644 --- a/libc/src/stdio/generic/getc.cpp +++ b/libc/src/stdio/generic/getc.cpp @@ -9,8 +9,9 @@ #include "src/stdio/getc.h" #include "src/__support/File/file.h" +#include "hdr/types/FILE.h" #include "src/errno/libc_errno.h" -#include +#include namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/generic/getc_unlocked.cpp b/libc/src/stdio/generic/getc_unlocked.cpp index 883405e84bad07..849d0be6725ae2 100644 --- a/libc/src/stdio/generic/getc_unlocked.cpp +++ b/libc/src/stdio/generic/getc_unlocked.cpp @@ -9,8 +9,9 @@ #include "src/stdio/getc_unlocked.h" #include "src/__support/File/file.h" +#include "hdr/types/FILE.h" #include "src/errno/libc_errno.h" -#include +#include namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/generic/getchar.cpp b/libc/src/stdio/generic/getchar.cpp index 181999fe56c422..bf3825bbbf166d 100644 --- a/libc/src/stdio/generic/getchar.cpp +++ b/libc/src/stdio/generic/getchar.cpp @@ -9,8 +9,8 @@ #include "src/stdio/getchar.h" #include "src/__support/File/file.h" +#include "hdr/types/FILE.h" #include "src/errno/libc_errno.h" -#include namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/generic/getchar_unlocked.cpp b/libc/src/stdio/generic/getchar_unlocked.cpp index be98d0333ec87b..86777d118ce3b8 100644 --- a/libc/src/stdio/generic/getchar_unlocked.cpp +++ b/libc/src/stdio/generic/getchar_unlocked.cpp @@ -9,8 +9,8 @@ #include "src/stdio/getchar_unlocked.h" #include "src/__support/File/file.h" +#include "hdr/types/FILE.h" #include "src/errno/libc_errno.h" -#include namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/generic/printf.cpp b/libc/src/stdio/generic/printf.cpp index 5701ca9eb2704c..14a4225af44c5a 100644 --- a/libc/src/stdio/generic/printf.cpp +++ b/libc/src/stdio/generic/printf.cpp @@ -12,8 +12,8 @@ #include "src/__support/arg_list.h" #include "src/stdio/printf_core/vfprintf_internal.h" +#include "hdr/types/FILE.h" #include -#include #ifndef LIBC_COPT_STDIO_USE_SYSTEM_FILE #define PRINTF_STDOUT LIBC_NAMESPACE::stdout diff --git a/libc/src/stdio/generic/putc.cpp b/libc/src/stdio/generic/putc.cpp index 58e3b4d1bae4db..e8ebbb3d18e9db 100644 --- a/libc/src/stdio/generic/putc.cpp +++ b/libc/src/stdio/generic/putc.cpp @@ -9,8 +9,9 @@ #include "src/stdio/putc.h" #include "src/__support/File/file.h" +#include "hdr/types/FILE.h" #include "src/errno/libc_errno.h" -#include +#include namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/generic/putchar.cpp b/libc/src/stdio/generic/putchar.cpp index 4a4aeb54c9c6f3..e9e6f962b3415f 100644 --- a/libc/src/stdio/generic/putchar.cpp +++ b/libc/src/stdio/generic/putchar.cpp @@ -9,8 +9,9 @@ #include "src/stdio/putchar.h" #include "src/__support/File/file.h" +#include "hdr/types/FILE.h" #include "src/errno/libc_errno.h" -#include +#include namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/generic/puts.cpp b/libc/src/stdio/generic/puts.cpp index 0f19ec52676712..247d4f088463cd 100644 --- a/libc/src/stdio/generic/puts.cpp +++ b/libc/src/stdio/generic/puts.cpp @@ -10,8 +10,9 @@ #include "src/__support/CPP/string_view.h" #include "src/__support/File/file.h" +#include "hdr/types/FILE.h" #include "src/errno/libc_errno.h" -#include +#include namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/generic/stderr.cpp b/libc/src/stdio/generic/stderr.cpp index 31b618f6928a0e..65ba305a149347 100644 --- a/libc/src/stdio/generic/stderr.cpp +++ b/libc/src/stdio/generic/stderr.cpp @@ -8,6 +8,6 @@ #include "src/__support/File/file.h" -#include +#include "hdr/types/FILE.h" extern "C" FILE *stderr; diff --git a/libc/src/stdio/generic/stdin.cpp b/libc/src/stdio/generic/stdin.cpp index f99ea898dfcd1a..ce1ae2d987ad91 100644 --- a/libc/src/stdio/generic/stdin.cpp +++ b/libc/src/stdio/generic/stdin.cpp @@ -8,6 +8,6 @@ #include "src/__support/File/file.h" -#include +#include "hdr/types/FILE.h" extern "C" FILE *stdin; diff --git a/libc/src/stdio/generic/stdout.cpp b/libc/src/stdio/generic/stdout.cpp index 2d5aaf5667260f..8ad8f64bae9613 100644 --- a/libc/src/stdio/generic/stdout.cpp +++ b/libc/src/stdio/generic/stdout.cpp @@ -8,6 +8,6 @@ #include "src/__support/File/file.h" -#include +#include "hdr/types/FILE.h" extern "C" FILE *stdout; diff --git a/libc/src/stdio/generic/ungetc.cpp b/libc/src/stdio/generic/ungetc.cpp index ccfbfb0121c86f..8e2897e3c52616 100644 --- a/libc/src/stdio/generic/ungetc.cpp +++ b/libc/src/stdio/generic/ungetc.cpp @@ -9,7 +9,7 @@ #include "src/stdio/ungetc.h" #include "src/__support/File/file.h" -#include +#include "hdr/types/FILE.h" namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/generic/vprintf.cpp b/libc/src/stdio/generic/vprintf.cpp index eff968d1e9134f..f78a84fb8454ff 100644 --- a/libc/src/stdio/generic/vprintf.cpp +++ b/libc/src/stdio/generic/vprintf.cpp @@ -12,8 +12,8 @@ #include "src/__support/arg_list.h" #include "src/stdio/printf_core/vfprintf_internal.h" +#include "hdr/types/FILE.h" #include -#include #ifndef LIBC_COPT_STDIO_USE_SYSTEM_FILE #define PRINTF_STDOUT LIBC_NAMESPACE::stdout diff --git a/libc/src/stdio/getc.h b/libc/src/stdio/getc.h index c085d35d7de9c7..85675268cb405a 100644 --- a/libc/src/stdio/getc.h +++ b/libc/src/stdio/getc.h @@ -9,7 +9,7 @@ #ifndef LLVM_LIBC_SRC_STDIO_GETC_H #define LLVM_LIBC_SRC_STDIO_GETC_H -#include +#include "hdr/types/FILE.h" namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/getc_unlocked.h b/libc/src/stdio/getc_unlocked.h index f4e1165dd75dcf..45dcb4eb0afa4b 100644 --- a/libc/src/stdio/getc_unlocked.h +++ b/libc/src/stdio/getc_unlocked.h @@ -9,7 +9,7 @@ #ifndef LLVM_LIBC_SRC_STDIO_GETC_UNLOCKED_H #define LLVM_LIBC_SRC_STDIO_GETC_UNLOCKED_H -#include +#include "hdr/types/FILE.h" namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/gpu/CMakeLists.txt b/libc/src/stdio/gpu/CMakeLists.txt index 8940843ea91b29..64bae7dc02d58f 100644 --- a/libc/src/stdio/gpu/CMakeLists.txt +++ b/libc/src/stdio/gpu/CMakeLists.txt @@ -3,6 +3,7 @@ add_header_library( HDRS file.h DEPENDS + libc.hdr.types.FILE libc.src.__support.RPC.rpc_client libc.src.__support.common .stdin @@ -17,7 +18,7 @@ add_entrypoint_object( HDRS ../feof.h DEPENDS - libc.include.stdio + libc.hdr.types.FILE libc.src.__support.RPC.rpc_client ) @@ -28,7 +29,7 @@ add_entrypoint_object( HDRS ../ferror.h DEPENDS - libc.include.stdio + libc.hdr.types.FILE libc.src.__support.RPC.rpc_client ) @@ -39,7 +40,7 @@ add_entrypoint_object( HDRS ../fseek.h DEPENDS - libc.include.stdio + libc.hdr.types.FILE .gpu_file ) @@ -50,7 +51,7 @@ add_entrypoint_object( HDRS ../ftell.h DEPENDS - libc.include.stdio + libc.hdr.types.FILE .gpu_file ) @@ -61,7 +62,7 @@ add_entrypoint_object( HDRS ../fflush.h DEPENDS - libc.include.stdio + libc.hdr.types.FILE .gpu_file ) @@ -72,7 +73,7 @@ add_entrypoint_object( HDRS ../clearerr.h DEPENDS - libc.include.stdio + libc.hdr.types.FILE libc.src.__support.RPC.rpc_client ) @@ -83,7 +84,7 @@ add_entrypoint_object( HDRS ../fopen.h DEPENDS - libc.include.stdio + libc.hdr.types.FILE ) add_entrypoint_object( @@ -93,7 +94,7 @@ add_entrypoint_object( HDRS ../fclose.h DEPENDS - libc.include.stdio + libc.hdr.types.FILE ) add_entrypoint_object( @@ -103,7 +104,7 @@ add_entrypoint_object( HDRS ../fread.h DEPENDS - libc.include.stdio + libc.hdr.types.FILE ) add_entrypoint_object( @@ -113,7 +114,8 @@ add_entrypoint_object( HDRS ../puts.h DEPENDS - libc.include.stdio + libc.hdr.types.FILE + libc.include.stdio # needed for stdin .gpu_file ) @@ -124,7 +126,7 @@ add_entrypoint_object( HDRS ../fputs.h DEPENDS - libc.include.stdio + libc.hdr.types.FILE .gpu_file ) @@ -135,7 +137,7 @@ add_entrypoint_object( HDRS ../fwrite.h DEPENDS - libc.include.stdio + libc.hdr.types.FILE .gpu_file ) @@ -146,7 +148,7 @@ add_entrypoint_object( HDRS ../fputc.h DEPENDS - libc.include.stdio + libc.hdr.types.FILE .gpu_file ) @@ -157,7 +159,8 @@ add_entrypoint_object( HDRS ../putc.h DEPENDS - libc.include.stdio + libc.hdr.types.FILE + libc.include.stdio # needed for stdin .gpu_file ) @@ -168,7 +171,8 @@ add_entrypoint_object( HDRS ../putchar.h DEPENDS - libc.include.stdio + libc.hdr.types.FILE + libc.include.stdio # needed for stdin .gpu_file ) @@ -179,18 +183,7 @@ add_entrypoint_object( HDRS ../fgetc.h DEPENDS - libc.include.stdio - .gpu_file -) - -add_entrypoint_object( - fgetc_unlocked - SRCS - fgetc_unlocked.cpp - HDRS - ../fgetc_unlocked.h - DEPENDS - libc.include.stdio + libc.hdr.types.FILE .gpu_file ) @@ -201,18 +194,8 @@ add_entrypoint_object( HDRS ../getc.h DEPENDS - libc.include.stdio - .gpu_file -) - -add_entrypoint_object( - getc_unlocked - SRCS - getc_unlocked.cpp - HDRS - ../getc_unlocked.h - DEPENDS - libc.include.stdio + libc.hdr.types.FILE + libc.include.stdio # needed for stdin .gpu_file ) @@ -223,18 +206,8 @@ add_entrypoint_object( HDRS ../getchar.h DEPENDS - libc.include.stdio - .gpu_file -) - -add_entrypoint_object( - getchar_unlocked - SRCS - getc_unlocked.cpp - HDRS - ../getc_unlocked.h - DEPENDS - libc.include.stdio + libc.hdr.types.FILE + libc.include.stdio # needed for stdin .gpu_file ) @@ -245,7 +218,7 @@ add_entrypoint_object( HDRS ../fgets.h DEPENDS - libc.include.stdio + libc.hdr.types.FILE .gpu_file .feof .ferror @@ -258,7 +231,7 @@ add_entrypoint_object( HDRS ../ungetc.h DEPENDS - libc.include.stdio + libc.hdr.types.FILE .gpu_file ) @@ -269,7 +242,7 @@ add_entrypoint_object( HDRS ../remove.h DEPENDS - libc.include.stdio + libc.hdr.types.FILE .gpu_file ) @@ -280,7 +253,7 @@ add_entrypoint_object( HDRS ../stdin.h DEPENDS - libc.include.stdio + libc.hdr.types.FILE ) add_entrypoint_object( @@ -290,7 +263,7 @@ add_entrypoint_object( HDRS ../stdout.h DEPENDS - libc.include.stdio + libc.hdr.types.FILE ) add_entrypoint_object( @@ -300,5 +273,5 @@ add_entrypoint_object( HDRS ../stderr.h DEPENDS - libc.include.stdio + libc.hdr.types.FILE ) diff --git a/libc/src/stdio/gpu/clearerr.cpp b/libc/src/stdio/gpu/clearerr.cpp index 2267fdf8115eed..ec7fe41ac08e18 100644 --- a/libc/src/stdio/gpu/clearerr.cpp +++ b/libc/src/stdio/gpu/clearerr.cpp @@ -9,7 +9,7 @@ #include "src/stdio/clearerr.h" #include "file.h" -#include +#include "hdr/types/FILE.h" namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/gpu/fclose.cpp b/libc/src/stdio/gpu/fclose.cpp index bdedbe51ec38ea..3bc68f1dfc7cdb 100644 --- a/libc/src/stdio/gpu/fclose.cpp +++ b/libc/src/stdio/gpu/fclose.cpp @@ -9,7 +9,8 @@ #include "src/stdio/fclose.h" #include "src/stdio/gpu/file.h" -#include +#include "hdr/stdio_macros.h" +#include "hdr/types/FILE.h" namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/gpu/feof.cpp b/libc/src/stdio/gpu/feof.cpp index ddcef384142c42..dee1e3841e638f 100644 --- a/libc/src/stdio/gpu/feof.cpp +++ b/libc/src/stdio/gpu/feof.cpp @@ -9,7 +9,7 @@ #include "src/stdio/feof.h" #include "file.h" -#include +#include "hdr/types/FILE.h" namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/gpu/ferror.cpp b/libc/src/stdio/gpu/ferror.cpp index 9ed598fb67541e..90e1592cdbe09c 100644 --- a/libc/src/stdio/gpu/ferror.cpp +++ b/libc/src/stdio/gpu/ferror.cpp @@ -9,7 +9,7 @@ #include "src/stdio/ferror.h" #include "file.h" -#include +#include "hdr/types/FILE.h" namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/gpu/fflush.cpp b/libc/src/stdio/gpu/fflush.cpp index 68192174e58a8e..60c352217dd968 100644 --- a/libc/src/stdio/gpu/fflush.cpp +++ b/libc/src/stdio/gpu/fflush.cpp @@ -9,7 +9,7 @@ #include "src/stdio/fflush.h" #include "file.h" -#include +#include "hdr/types/FILE.h" namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/gpu/fgetc.cpp b/libc/src/stdio/gpu/fgetc.cpp index 56f42a04857fb2..08e6eb37c5e0de 100644 --- a/libc/src/stdio/gpu/fgetc.cpp +++ b/libc/src/stdio/gpu/fgetc.cpp @@ -9,7 +9,8 @@ #include "src/stdio/fgetc.h" #include "file.h" -#include +#include "hdr/stdio_macros.h" // for EOF. +#include "hdr/types/FILE.h" namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/gpu/fgets.cpp b/libc/src/stdio/gpu/fgets.cpp index 5ea4bdcdc9e0fe..fb0a30b78e6973 100644 --- a/libc/src/stdio/gpu/fgets.cpp +++ b/libc/src/stdio/gpu/fgets.cpp @@ -11,8 +11,9 @@ #include "src/stdio/feof.h" #include "src/stdio/ferror.h" +#include "hdr/stdio_macros.h" // for EOF. +#include "hdr/types/FILE.h" #include -#include namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/gpu/file.h b/libc/src/stdio/gpu/file.h index 2cab2e6d36a259..8cbba9ec5d713c 100644 --- a/libc/src/stdio/gpu/file.h +++ b/libc/src/stdio/gpu/file.h @@ -9,7 +9,9 @@ #include "src/__support/RPC/rpc_client.h" #include "src/string/string_utils.h" -#include +#include "hdr/types/FILE.h" + +#include //needed for stdin/out/err namespace LIBC_NAMESPACE { namespace file { diff --git a/libc/src/stdio/gpu/fopen.cpp b/libc/src/stdio/gpu/fopen.cpp index 41d2c89473168e..1e55725f18ccee 100644 --- a/libc/src/stdio/gpu/fopen.cpp +++ b/libc/src/stdio/gpu/fopen.cpp @@ -10,7 +10,7 @@ #include "src/__support/CPP/string_view.h" #include "src/stdio/gpu/file.h" -#include +#include "hdr/types/FILE.h" namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/gpu/fputc.cpp b/libc/src/stdio/gpu/fputc.cpp index e6ef12f4b2f804..a99eaeb8ceb93c 100644 --- a/libc/src/stdio/gpu/fputc.cpp +++ b/libc/src/stdio/gpu/fputc.cpp @@ -6,10 +6,11 @@ // //===----------------------------------------------------------------------===// -#include "file.h" #include "src/stdio/fputc.h" +#include "file.h" -#include +#include "hdr/stdio_macros.h" // for EOF. +#include "hdr/types/FILE.h" namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/gpu/fputs.cpp b/libc/src/stdio/gpu/fputs.cpp index 1b6e0732b98cd6..4803da978dc1fe 100644 --- a/libc/src/stdio/gpu/fputs.cpp +++ b/libc/src/stdio/gpu/fputs.cpp @@ -11,7 +11,8 @@ #include "src/errno/libc_errno.h" #include "src/stdio/gpu/file.h" -#include +#include "hdr/stdio_macros.h" // for EOF. +#include "hdr/types/FILE.h" namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/gpu/fread.cpp b/libc/src/stdio/gpu/fread.cpp index fe367ae1aa2499..233a7809e8468d 100644 --- a/libc/src/stdio/gpu/fread.cpp +++ b/libc/src/stdio/gpu/fread.cpp @@ -9,7 +9,7 @@ #include "src/stdio/fread.h" #include "src/stdio/gpu/file.h" -#include +#include "hdr/types/FILE.h" namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/gpu/fseek.cpp b/libc/src/stdio/gpu/fseek.cpp index 3e93ddb46bf975..3b1f85db1fd0b7 100644 --- a/libc/src/stdio/gpu/fseek.cpp +++ b/libc/src/stdio/gpu/fseek.cpp @@ -9,7 +9,7 @@ #include "src/stdio/fseek.h" #include "file.h" -#include +#include "hdr/types/FILE.h" namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/gpu/ftell.cpp b/libc/src/stdio/gpu/ftell.cpp index aea3e8b229fce6..5664726d68d306 100644 --- a/libc/src/stdio/gpu/ftell.cpp +++ b/libc/src/stdio/gpu/ftell.cpp @@ -9,7 +9,7 @@ #include "src/stdio/ftell.h" #include "file.h" -#include +#include "hdr/types/FILE.h" namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/gpu/fwrite.cpp b/libc/src/stdio/gpu/fwrite.cpp index a059bd5ea3b719..1321e32c272a18 100644 --- a/libc/src/stdio/gpu/fwrite.cpp +++ b/libc/src/stdio/gpu/fwrite.cpp @@ -9,7 +9,7 @@ #include "src/stdio/fwrite.h" #include "file.h" -#include +#include "hdr/types/FILE.h" namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/gpu/getc.cpp b/libc/src/stdio/gpu/getc.cpp index b50e3963c31a11..d77d8ba0ff4210 100644 --- a/libc/src/stdio/gpu/getc.cpp +++ b/libc/src/stdio/gpu/getc.cpp @@ -9,7 +9,8 @@ #include "src/stdio/getc.h" #include "file.h" -#include +#include "hdr/stdio_macros.h" // for EOF. +#include "hdr/types/FILE.h" namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/gpu/getchar.cpp b/libc/src/stdio/gpu/getchar.cpp index c8a004124a2e57..28e86da8400a3f 100644 --- a/libc/src/stdio/gpu/getchar.cpp +++ b/libc/src/stdio/gpu/getchar.cpp @@ -9,7 +9,10 @@ #include "src/stdio/getchar.h" #include "file.h" -#include +#include "hdr/stdio_macros.h" // for EOF. +#include "hdr/types/FILE.h" + +#include //needed for stdin namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/gpu/putc.cpp b/libc/src/stdio/gpu/putc.cpp index b5ecbfc65d6779..d054d282c4632b 100644 --- a/libc/src/stdio/gpu/putc.cpp +++ b/libc/src/stdio/gpu/putc.cpp @@ -9,7 +9,8 @@ #include "src/stdio/putc.h" #include "file.h" -#include +#include "hdr/stdio_macros.h" // for EOF. +#include "hdr/types/FILE.h" namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/gpu/putchar.cpp b/libc/src/stdio/gpu/putchar.cpp index 57663eec40f3b7..3e38401c7a0427 100644 --- a/libc/src/stdio/gpu/putchar.cpp +++ b/libc/src/stdio/gpu/putchar.cpp @@ -6,10 +6,13 @@ // //===----------------------------------------------------------------------===// -#include "file.h" #include "src/stdio/putchar.h" +#include "file.h" + +#include "hdr/stdio_macros.h" // for EOF. +#include "hdr/types/FILE.h" -#include +#include //needed for stdout namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/gpu/puts.cpp b/libc/src/stdio/gpu/puts.cpp index 10573a862a4c20..f6d91ccf630086 100644 --- a/libc/src/stdio/gpu/puts.cpp +++ b/libc/src/stdio/gpu/puts.cpp @@ -11,7 +11,10 @@ #include "src/errno/libc_errno.h" #include "src/stdio/gpu/file.h" -#include +#include "hdr/stdio_macros.h" // for EOF. +#include "hdr/types/FILE.h" + +#include //needed for stdout namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/gpu/remove.cpp b/libc/src/stdio/gpu/remove.cpp index 398be5f7ef436e..6b53e1f6af596a 100644 --- a/libc/src/stdio/gpu/remove.cpp +++ b/libc/src/stdio/gpu/remove.cpp @@ -9,7 +9,7 @@ #include "src/stdio/remove.h" #include "file.h" -#include +#include "hdr/types/FILE.h" namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/gpu/stderr.cpp b/libc/src/stdio/gpu/stderr.cpp index 70846827064a38..e239b94c7b8a9b 100644 --- a/libc/src/stdio/gpu/stderr.cpp +++ b/libc/src/stdio/gpu/stderr.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "hdr/types/FILE.h" namespace LIBC_NAMESPACE { static struct { diff --git a/libc/src/stdio/gpu/stdin.cpp b/libc/src/stdio/gpu/stdin.cpp index 1a58461c3dec93..6a305c89ac23cf 100644 --- a/libc/src/stdio/gpu/stdin.cpp +++ b/libc/src/stdio/gpu/stdin.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "hdr/types/FILE.h" namespace LIBC_NAMESPACE { static struct { diff --git a/libc/src/stdio/gpu/stdout.cpp b/libc/src/stdio/gpu/stdout.cpp index abeeff2ce9f53c..fffe1376a818f3 100644 --- a/libc/src/stdio/gpu/stdout.cpp +++ b/libc/src/stdio/gpu/stdout.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "hdr/types/FILE.h" namespace LIBC_NAMESPACE { static struct { diff --git a/libc/src/stdio/gpu/ungetc.cpp b/libc/src/stdio/gpu/ungetc.cpp index 373164a0c53a32..52379e125464b2 100644 --- a/libc/src/stdio/gpu/ungetc.cpp +++ b/libc/src/stdio/gpu/ungetc.cpp @@ -9,7 +9,7 @@ #include "src/stdio/ungetc.h" #include "file.h" -#include +#include "hdr/types/FILE.h" namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/printf.h b/libc/src/stdio/printf.h index c5b4603c589d51..60ccf613e29809 100644 --- a/libc/src/stdio/printf.h +++ b/libc/src/stdio/printf.h @@ -9,7 +9,7 @@ #ifndef LLVM_LIBC_SRC_STDIO_PRINTF_H #define LLVM_LIBC_SRC_STDIO_PRINTF_H -#include +#include "hdr/types/FILE.h" namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/printf_core/vfprintf_internal.h b/libc/src/stdio/printf_core/vfprintf_internal.h index c16c3ae15fb7c5..2917aa22865f53 100644 --- a/libc/src/stdio/printf_core/vfprintf_internal.h +++ b/libc/src/stdio/printf_core/vfprintf_internal.h @@ -16,7 +16,7 @@ #include "src/stdio/printf_core/printf_main.h" #include "src/stdio/printf_core/writer.h" -#include +#include "hdr/types/FILE.h" namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/putc.h b/libc/src/stdio/putc.h index a8fb5b7fa97eb1..9d331d005bf68a 100644 --- a/libc/src/stdio/putc.h +++ b/libc/src/stdio/putc.h @@ -9,7 +9,7 @@ #ifndef LLVM_LIBC_SRC_STDIO_PUTC_H #define LLVM_LIBC_SRC_STDIO_PUTC_H -#include +#include "hdr/types/FILE.h" namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/remove.h b/libc/src/stdio/remove.h index 8c52fe5eee8e87..3e541a0c675ae4 100644 --- a/libc/src/stdio/remove.h +++ b/libc/src/stdio/remove.h @@ -9,7 +9,7 @@ #ifndef LLVM_LIBC_SRC_STDIO_REMOVE_H #define LLVM_LIBC_SRC_STDIO_REMOVE_H -#include +#include "hdr/types/FILE.h" namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/scanf.cpp b/libc/src/stdio/scanf.cpp index 3a9fafab38be3a..bfa8d46007b997 100644 --- a/libc/src/stdio/scanf.cpp +++ b/libc/src/stdio/scanf.cpp @@ -12,8 +12,8 @@ #include "src/__support/arg_list.h" #include "src/stdio/scanf_core/vfscanf_internal.h" +#include "hdr/types/FILE.h" #include -#include #ifndef LIBC_COPT_STDIO_USE_SYSTEM_FILE #define SCANF_STDIN LIBC_NAMESPACE::stdin diff --git a/libc/src/stdio/scanf_core/vfscanf_internal.h b/libc/src/stdio/scanf_core/vfscanf_internal.h index 8081136d471a20..0571eaca3c5702 100644 --- a/libc/src/stdio/scanf_core/vfscanf_internal.h +++ b/libc/src/stdio/scanf_core/vfscanf_internal.h @@ -14,7 +14,8 @@ #include "src/stdio/scanf_core/reader.h" #include "src/stdio/scanf_core/scanf_main.h" -#include +#include "hdr/types/FILE.h" +#include namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/setbuf.cpp b/libc/src/stdio/setbuf.cpp index 8819901849a08f..61a5cc617828db 100644 --- a/libc/src/stdio/setbuf.cpp +++ b/libc/src/stdio/setbuf.cpp @@ -7,10 +7,9 @@ //===----------------------------------------------------------------------===// #include "src/stdio/setbuf.h" +#include "hdr/stdio_macros.h" #include "src/__support/File/file.h" - #include "src/errno/libc_errno.h" -#include namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/setbuf.h b/libc/src/stdio/setbuf.h index 9c7aab95d2c9e3..ec81994d228152 100644 --- a/libc/src/stdio/setbuf.h +++ b/libc/src/stdio/setbuf.h @@ -9,7 +9,7 @@ #ifndef LLVM_LIBC_SRC_STDIO_SETBUF_H #define LLVM_LIBC_SRC_STDIO_SETBUF_H -#include +#include "hdr/types/FILE.h" namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/setvbuf.cpp b/libc/src/stdio/setvbuf.cpp index 5fdaebcdb75c2b..186848a5480622 100644 --- a/libc/src/stdio/setvbuf.cpp +++ b/libc/src/stdio/setvbuf.cpp @@ -9,8 +9,9 @@ #include "src/stdio/setvbuf.h" #include "src/__support/File/file.h" +#include "hdr/types/FILE.h" #include "src/errno/libc_errno.h" -#include +#include namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/setvbuf.h b/libc/src/stdio/setvbuf.h index 21d9c9918ffa12..4fe4811a795c23 100644 --- a/libc/src/stdio/setvbuf.h +++ b/libc/src/stdio/setvbuf.h @@ -9,7 +9,8 @@ #ifndef LLVM_LIBC_SRC_STDIO_SETVBUF_H #define LLVM_LIBC_SRC_STDIO_SETVBUF_H -#include +#include "hdr/types/FILE.h" +#include namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/sscanf.cpp b/libc/src/stdio/sscanf.cpp index 9bbd813514ffa0..28c3e75907fad1 100644 --- a/libc/src/stdio/sscanf.cpp +++ b/libc/src/stdio/sscanf.cpp @@ -13,8 +13,9 @@ #include "src/stdio/scanf_core/reader.h" #include "src/stdio/scanf_core/scanf_main.h" +#include "hdr/stdio_macros.h" +#include "hdr/types/FILE.h" #include -#include namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/ungetc.h b/libc/src/stdio/ungetc.h index c24d8e5600cadf..9a4470485e35d9 100644 --- a/libc/src/stdio/ungetc.h +++ b/libc/src/stdio/ungetc.h @@ -9,7 +9,7 @@ #ifndef LLVM_LIBC_SRC_STDIO_UNGETC_H #define LLVM_LIBC_SRC_STDIO_UNGETC_H -#include +#include "hdr/types/FILE.h" namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/vfprintf.cpp b/libc/src/stdio/vfprintf.cpp index 2504ce8a20bac5..4e3d460af74d9f 100644 --- a/libc/src/stdio/vfprintf.cpp +++ b/libc/src/stdio/vfprintf.cpp @@ -12,8 +12,8 @@ #include "src/__support/arg_list.h" #include "src/stdio/printf_core/vfprintf_internal.h" +#include "hdr/types/FILE.h" #include -#include namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/vfprintf.h b/libc/src/stdio/vfprintf.h index 01827c59d6ce15..af8e3c9112a55f 100644 --- a/libc/src/stdio/vfprintf.h +++ b/libc/src/stdio/vfprintf.h @@ -9,8 +9,8 @@ #ifndef LLVM_LIBC_SRC_STDIO_VFPRINTF_H #define LLVM_LIBC_SRC_STDIO_VFPRINTF_H +#include "hdr/types/FILE.h" #include -#include namespace LIBC_NAMESPACE { diff --git a/libc/src/stdio/vprintf.h b/libc/src/stdio/vprintf.h index fe4252bd86203b..adc507a4c0b9ac 100644 --- a/libc/src/stdio/vprintf.h +++ b/libc/src/stdio/vprintf.h @@ -9,8 +9,8 @@ #ifndef LLVM_LIBC_SRC_STDIO_VPRINTF_H #define LLVM_LIBC_SRC_STDIO_VPRINTF_H +#include "hdr/types/FILE.h" #include -#include namespace LIBC_NAMESPACE { diff --git a/libc/src/unistd/getopt.cpp b/libc/src/unistd/getopt.cpp index ccdfdc6c64666f..2a05500b2d74f5 100644 --- a/libc/src/unistd/getopt.cpp +++ b/libc/src/unistd/getopt.cpp @@ -13,7 +13,7 @@ #include "src/__support/common.h" #include "src/stdio/fprintf.h" -#include +#include "hdr/types/FILE.h" // This is POSIX compliant and does not support GNU extensions, mainly this is // just the re-ordering of argv elements such that unknown arguments can be diff --git a/libc/src/unistd/getopt.h b/libc/src/unistd/getopt.h index ae27958756f44a..fe8ae5ff5b91c9 100644 --- a/libc/src/unistd/getopt.h +++ b/libc/src/unistd/getopt.h @@ -9,7 +9,7 @@ #ifndef LLVM_LIBC_SRC_UNISTD_GETOPT_H #define LLVM_LIBC_SRC_UNISTD_GETOPT_H -#include +#include "hdr/types/FILE.h" #include namespace LIBC_NAMESPACE { diff --git a/libc/src/wchar/btowc.cpp b/libc/src/wchar/btowc.cpp index 040c60eb805c72..ea093bc5f2552c 100644 --- a/libc/src/wchar/btowc.cpp +++ b/libc/src/wchar/btowc.cpp @@ -10,7 +10,7 @@ #include "src/__support/common.h" #include "src/__support/wctype_utils.h" -#include // for EOF. +#include "hdr/stdio_macros.h" // for EOF. namespace LIBC_NAMESPACE { diff --git a/libc/src/wchar/wctob.cpp b/libc/src/wchar/wctob.cpp index 538d5388e50581..885c526d0d6349 100644 --- a/libc/src/wchar/wctob.cpp +++ b/libc/src/wchar/wctob.cpp @@ -10,7 +10,7 @@ #include "src/__support/common.h" #include "src/__support/wctype_utils.h" -#include // for EOF. +#include "hdr/stdio_macros.h" // for EOF. namespace LIBC_NAMESPACE { diff --git a/utils/bazel/llvm-project-overlay/libc/BUILD.bazel b/utils/bazel/llvm-project-overlay/libc/BUILD.bazel index 76b6aac185f5e2..28cc040ff4bee9 100644 --- a/utils/bazel/llvm-project-overlay/libc/BUILD.bazel +++ b/utils/bazel/llvm-project-overlay/libc/BUILD.bazel @@ -138,6 +138,11 @@ libc_support_library( hdrs = ["hdr/float_macros.h"], ) +libc_support_library( + name = "hdr_stdio_macros", + hdrs = ["hdr/stdio_macros.h"], +) + ############################ Type Proxy Header Files ########################### libc_support_library( @@ -180,6 +185,16 @@ libc_support_library( hdrs = ["hdr/types/pid_t.h"], ) +libc_support_library( + name = "types_off_t", + hdrs = ["hdr/types/off_t.h"], +) + +libc_support_library( + name = "types_FILE", + hdrs = ["hdr/types/FILE.h"], +) + ############################### Support libraries ############################## libc_support_library( @@ -667,6 +682,8 @@ libc_support_library( ":__support_error_or", ":__support_threads_mutex", ":errno", + ":hdr_stdio_macros", + ":types_off_t", ], ) @@ -678,6 +695,7 @@ libc_support_library( ":__support_error_or", ":__support_osutil_syscall", ":errno", + ":types_off_t", ], ) @@ -3430,6 +3448,7 @@ libc_function( ":__support_arg_list", ":__support_file_file", ":errno", + ":types_FILE", ":vfprintf_internal", ], ) @@ -3442,6 +3461,7 @@ libc_function( ":__support_arg_list", ":__support_file_file", ":errno", + ":types_FILE", ":vfprintf_internal", ], ) @@ -3479,6 +3499,7 @@ libc_function( ":__support_arg_list", ":__support_file_file", ":errno", + ":types_FILE", ":vfprintf_internal", ], ) @@ -3491,6 +3512,7 @@ libc_function( ":__support_arg_list", ":__support_file_file", ":errno", + ":types_FILE", ":vfprintf_internal", ], ) @@ -3503,6 +3525,7 @@ libc_function( ":__support_common", ":__support_osutil_syscall", ":errno", + ":types_FILE", ], )