diff options
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/generic/_G_config.h | 58 | ||||
| -rw-r--r-- | sysdeps/pthread/flockfile.c | 1 | ||||
| -rw-r--r-- | sysdeps/pthread/funlockfile.c | 1 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/bits/_G_config.h (renamed from sysdeps/unix/sysv/linux/_G_config.h) | 10 |
4 files changed, 7 insertions, 63 deletions
diff --git a/sysdeps/generic/_G_config.h b/sysdeps/generic/_G_config.h deleted file mode 100644 index c49eed395b..0000000000 --- a/sysdeps/generic/_G_config.h +++ /dev/null @@ -1,58 +0,0 @@ -/* This file is needed by libio to define various configuration parameters. - These are always the same in the GNU C library. */ - -#ifndef _G_config_h -#define _G_config_h 1 - -/* Define types for libio in terms of the standard internal type names. */ - -#include <bits/types.h> -#define __need_size_t -#if defined _LIBC || defined _GLIBCPP_USE_WCHAR_T -# define __need_wchar_t -#endif -#define __need_NULL -#include <stddef.h> - -#include <bits/types/__mbstate_t.h> -#if defined _LIBC || defined _GLIBCPP_USE_WCHAR_T -# include <bits/types/wint_t.h> -#endif - -typedef struct -{ - __off_t __pos; - __mbstate_t __state; -} _G_fpos_t; -typedef struct -{ - __off64_t __pos; - __mbstate_t __state; -} _G_fpos64_t; -#if defined _LIBC || defined _GLIBCPP_USE_WCHAR_T -# include <gconv.h> -typedef union -{ - struct __gconv_info __cd; - struct - { - struct __gconv_info __cd; - struct __gconv_step_data __data; - } __combined; -} _G_iconv_t; -#endif - - -/* These library features are always available in the GNU C library. */ -#define _G_va_list __gnuc_va_list - -#define _G_HAVE_MMAP 1 - -#define _G_IO_IO_FILE_VERSION 0x20001 - -/* This is defined by <bits/stat.h> if `st_blksize' exists. */ -#define _G_HAVE_ST_BLKSIZE defined (_STATBUF_ST_BLKSIZE) - -#define _G_BUFSIZ 8192 - -#endif /* _G_config.h */ diff --git a/sysdeps/pthread/flockfile.c b/sysdeps/pthread/flockfile.c index a8e6c28ed9..14c1be1d80 100644 --- a/sysdeps/pthread/flockfile.c +++ b/sysdeps/pthread/flockfile.c @@ -18,7 +18,6 @@ #include <pthread.h> #include <stdio.h> -#include <libio.h> #include <stdio-lock.h> diff --git a/sysdeps/pthread/funlockfile.c b/sysdeps/pthread/funlockfile.c index 2389ad4fbf..9f5463448f 100644 --- a/sysdeps/pthread/funlockfile.c +++ b/sysdeps/pthread/funlockfile.c @@ -18,7 +18,6 @@ #include <pthread.h> #include <stdio.h> -#include <libio.h> #include <stdio-lock.h> diff --git a/sysdeps/unix/sysv/linux/_G_config.h b/sysdeps/unix/sysv/linux/bits/_G_config.h index 3bc6cfd595..9994869098 100644 --- a/sysdeps/unix/sysv/linux/_G_config.h +++ b/sysdeps/unix/sysv/linux/bits/_G_config.h @@ -1,8 +1,12 @@ /* This file is needed by libio to define various configuration parameters. These are always the same in the GNU C library. */ -#ifndef _G_config_h -#define _G_config_h 1 +#ifndef _BITS_G_CONFIG_H +#define _BITS_G_CONFIG_H 1 + +#if !defined _BITS_LIBIO_H && !defined _G_CONFIG_H +# error "Never include <bits/_G_config.h> directly; use <stdio.h> instead." +#endif /* Define types for libio in terms of the standard internal type names. */ @@ -56,4 +60,4 @@ typedef union #define _G_BUFSIZ 8192 -#endif /* _G_config.h */ +#endif /* bits/_G_config.h */ |