From: Joseph Myers <joseph@codesourcery.com>
Date: Mon, 17 Sep 2012 11:43:06 +0000 (+0000)
Subject: Remove _G_HAVE_IO_GETLINE_INFO.
X-Git-Tag: glibc-2.17~540
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b7aaa4d6d275b42a425478748f13f6f244154dee;p=thirdparty%2Fglibc.git

Remove _G_HAVE_IO_GETLINE_INFO.
---

diff --git a/ChangeLog b/ChangeLog
index b214afc0c03..358ea37a37b 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 f097f800231..bdb35b30fbc 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 598ece1730f..63b7da67201 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 df08676fecf..71974ca3bed 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 7d7164341c4..604fa2e93e2 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 0808a55b03d..70de3c67d4f 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