Remove _G_HAVE_IO_GETLINE_INFO.

diff --git a/ChangeLog b/ChangeLog
index b214afc0c03462f3d5748174761fc951130c402a..358ea37a37b29c9c56f83e8f4231777714226b61 100644 (file)
--- 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 f097f8002314da3c6eb8b094b3308877f7e1a7f6..bdb35b30fbcf1beea516a2954081344a6f1461e5 100644 (file)
--- 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 598ece1730f43aa07ec94ca0fb99e0342cc430a7..63b7da67201b3f108f386125a84ba5d58ff35580 100644 (file)
--- 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 df08676fecf46373be3a31f96e403a5c00681615..71974ca3bedeefd45c3efb90a3d5671dd0623abb 100644 (file)
--- 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 7d7164341c469c4083598999efd8c97854666a57..604fa2e93e26867222b9780590dedb5423497a44 100644 (file)
--- 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 0808a55b03d12335f8cd2be3615d6269235d2aa6..70de3c67d4f6e72178f7f0fbbaeff268ed06b1c1 100644 (file)
--- 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