diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2012-09-17 11:43:06 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2012-09-17 11:43:06 +0000 |
| commit | b7aaa4d6d275b42a425478748f13f6f244154dee (patch) | |
| tree | f22c276a42ac079a50d001c0c3d94e36c0e98925 | |
| parent | 6551399088ae065e0f3c1c0b2be687652eacb561 (diff) | |
| download | glibc-b7aaa4d6d275b42a425478748f13f6f244154dee.tar.gz glibc-b7aaa4d6d275b42a425478748f13f6f244154dee.tar.xz glibc-b7aaa4d6d275b42a425478748f13f6f244154dee.zip | |
Remove _G_HAVE_IO_GETLINE_INFO.
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | libio/iogetline.c | 4 | ||||
| -rw-r--r-- | libio/iogetwline.c | 4 | ||||
| -rw-r--r-- | sysdeps/generic/_G_config.h | 1 | ||||
| -rw-r--r-- | sysdeps/gnu/_G_config.h | 1 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/_G_config.h | 1 |
6 files changed, 11 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog index b214afc0c0..358ea37a37 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2012-09-17 Joseph Myers <joseph@codesourcery.com> + + * libio/iogetline.c [_LIBC || !_G_HAVE_IO_GETLINE_INFO]: Make code + unconditional. + * libio/iogetwline.c [_LIBC || !_G_HAVE_IO_GETLINE_INFO]: + Likewise. + * sysdeps/generic/_G_config.h (_G_HAVE_IO_GETLINE_INFO): Remove. + * sysdeps/gnu/_G_config.h (_G_HAVE_IO_GETLINE_INFO): Likewise. + * sysdeps/mach/hurd/_G_config.h (_G_HAVE_IO_GETLINE_INFO): + Likewise. + 2012-09-14 H.J. Lu <hongjiu.lu@intel.com> [BZ #14587] diff --git a/libio/iogetline.c b/libio/iogetline.c index f097f80023..bdb35b30fb 100644 --- a/libio/iogetline.c +++ b/libio/iogetline.c @@ -27,8 +27,6 @@ #include "libioP.h" #include <string.h> -#if defined _LIBC || !_G_HAVE_IO_GETLINE_INFO - _IO_size_t _IO_getline (fp, buf, n, delim, extract_delim) _IO_FILE *fp; @@ -117,5 +115,3 @@ _IO_getline_info (fp, buf, n, delim, extract_delim, eof) return ptr - buf; } libc_hidden_def (_IO_getline_info) - -#endif /* Defined _LIBC || !_G_HAVE_IO_GETLINE_INFO */ diff --git a/libio/iogetwline.c b/libio/iogetwline.c index 598ece1730..63b7da6720 100644 --- a/libio/iogetwline.c +++ b/libio/iogetwline.c @@ -32,8 +32,6 @@ # define wmemcpy __wmemcpy #endif -#if defined _LIBC || !_G_HAVE_IO_GETLINE_INFO - _IO_size_t _IO_getwline (fp, buf, n, delim, extract_delim) _IO_FILE *fp; @@ -122,5 +120,3 @@ _IO_getwline_info (fp, buf, n, delim, extract_delim, eof) } return ptr - buf; } - -#endif /* Defined _LIBC || !_G_HAVE_IO_GETLINE_INFO */ diff --git a/sysdeps/generic/_G_config.h b/sysdeps/generic/_G_config.h index df08676fec..71974ca3be 100644 --- a/sysdeps/generic/_G_config.h +++ b/sysdeps/generic/_G_config.h @@ -57,7 +57,6 @@ typedef union #define _G_va_list __gnuc_va_list #define _G_HAVE_MMAP 1 -#define _G_HAVE_IO_GETLINE_INFO 1 #define _G_IO_IO_FILE_VERSION 0x20001 diff --git a/sysdeps/gnu/_G_config.h b/sysdeps/gnu/_G_config.h index 7d7164341c..604fa2e93e 100644 --- a/sysdeps/gnu/_G_config.h +++ b/sysdeps/gnu/_G_config.h @@ -58,7 +58,6 @@ typedef union #define _G_HAVE_MMAP 1 #define _G_HAVE_MREMAP 1 -#define _G_HAVE_IO_GETLINE_INFO 1 #define _G_IO_IO_FILE_VERSION 0x20001 diff --git a/sysdeps/mach/hurd/_G_config.h b/sysdeps/mach/hurd/_G_config.h index 0808a55b03..70de3c67d4 100644 --- a/sysdeps/mach/hurd/_G_config.h +++ b/sysdeps/mach/hurd/_G_config.h @@ -57,7 +57,6 @@ typedef union #define _G_va_list __gnuc_va_list #define _G_HAVE_MMAP 1 -#define _G_HAVE_IO_GETLINE_INFO 1 #define _G_IO_IO_FILE_VERSION 0x20001 |