From 48a8f8328122ab8d06b7333cb87be46feeaf7cca Mon Sep 17 00:00:00 2001 From: Zack Weinberg Date: Sat, 23 Dec 2017 00:06:03 -0500 Subject: Deprecate external use of libio.h and _G_config.h. libio.h was originally the header for a set of supported GNU extensions, but they have not been maintained as such in many years, they are now standing in the way of improvements to stdio, and we don't think there are any remaining external users. _G_config.h was never intended for public use, but predates the bits convention. Move both of these headers into the bits directory and provide stubs at top level which issue deprecation warnings. The contents of (bits/)libio.h and (bits/)_G_config.h are still exposed to external software via stdio.h; changing that requires more complex surgery than I have time to attempt right now. * libio/libio.h, libio/_G_config.h: New stub headers which issue a deprecation warning and then include , respectively. * libio/libio.h: Rename the original version of this file to libio/bits/libio.h. Error out if not included by stdio.h or the stub libio.h. * include/libio.h: Move to include/bits. Forward to libio/bits/libio.h. * sysdeps/generic/_G_config.h: Move to top-level bits/. Error out if not included by bits/libio.h or the stub _G_config.h. * sysdeps/unix/sysv/linux/_G_config.h: Move to sysdeps/unix/sysv/linux/bits. Error out if not included by bits/libio.h or the stub _G_config.h. * libio/stdio.h: Include bits/libio.h, not libio.h. * libio/Makefile: Install bits/libio.h and bits/_G_config.h as well as libio.h and _G_config.h. * csu/init.c, libio/fmemopen.c, libio/iolibio.h, libio/oldfmemopen.c * libio/strfile.h, stdio-common/vfscanf.c * sysdeps/pthread/flockfile.c, sysdeps/pthread/funlockfile.c Include stdio.h, not _G_config.h nor libio.h. * libio/iofgetpos.c: Also rename fgetpos64 out of the way. * libio/iofsetpos.c: Also rename fsetpos64 out of the way. * scripts/check-installed-headers.sh: Skip libio.h and _G_config.h. --- libio/strfile.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'libio/strfile.h') diff --git a/libio/strfile.h b/libio/strfile.h index 74bd4eb269..494526b142 100644 --- a/libio/strfile.h +++ b/libio/strfile.h @@ -24,10 +24,7 @@ This exception applies to code released by its copyright holders in files containing the exception. */ -#include -#ifdef TODO -Merge into libio.h ? -#endif +#include typedef void *(*_IO_alloc_type) (_IO_size_t); typedef void (*_IO_free_type) (void*); -- cgit 1.4.1