This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

GNU C Library master sources branch master updated. glibc-2.16-ports-merge-339-gb7aaa4d


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  b7aaa4d6d275b42a425478748f13f6f244154dee (commit)
      from  6551399088ae065e0f3c1c0b2be687652eacb561 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=b7aaa4d6d275b42a425478748f13f6f244154dee

commit b7aaa4d6d275b42a425478748f13f6f244154dee
Author: Joseph Myers <joseph@codesourcery.com>
Date:   Mon Sep 17 11:43:06 2012 +0000

    Remove _G_HAVE_IO_GETLINE_INFO.

diff --git a/ChangeLog b/ChangeLog
index b214afc..358ea37 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 f097f80..bdb35b3 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 598ece1..63b7da6 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 df08676..71974ca 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 7d71643..604fa2e 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 0808a55..70de3c6 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
 

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                     |   11 +++++++++++
 libio/iogetline.c             |    4 ----
 libio/iogetwline.c            |    4 ----
 sysdeps/generic/_G_config.h   |    1 -
 sysdeps/gnu/_G_config.h       |    1 -
 sysdeps/mach/hurd/_G_config.h |    1 -
 6 files changed, 11 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]