[commits] r13894 - in /fsf/trunk/libc: ChangeLog grp/compat-initgroups.c libio/freopen.c libio/freopen64.c

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Fri May 20 00:03:31 2011
New Revision: 13894

Log:
Import glibc-mainline for 2011-05-20

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/grp/compat-initgroups.c
    fsf/trunk/libc/libio/freopen.c
    fsf/trunk/libc/libio/freopen64.c

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Fri May 20 00:03:31 2011
@@ -1,3 +1,12 @@
+2011-05-19  Andreas Schwab  <schwab@xxxxxxxxxx>
+
+	* grp/compat-initgroups.c (__libc_use_alloca): Don't define.
+
+2011-05-19  Ulrich Drepper  <drepper@xxxxxxxxx>
+
+	* libio/freopen.c (freopen): Use __dup2, not dup2.
+	* libio/freopen64.c (freopen64): Likewise.
+
 2011-05-17  H.J. Lu  <hongjiu.lu@xxxxxxxxx>
 
 	[BZ #12775]

Modified: fsf/trunk/libc/grp/compat-initgroups.c
==============================================================================
--- fsf/trunk/libc/grp/compat-initgroups.c (original)
+++ fsf/trunk/libc/grp/compat-initgroups.c Fri May 20 00:03:31 2011
@@ -7,12 +7,6 @@
 /* Prototype for the setgrent functions we use here.  */
 typedef enum nss_status (*get_function) (struct group *, char *,
 					 size_t, int *);
-
-/* This file is also used in nscd where __libc_alloca_cutoff is not
-   available.  */
-#ifdef NOT_IN_libc
-# define __libc_use_alloca(size) ((size) < __MAX_ALLOCA_CUTOFF * 4)
-#endif
 
 
 static enum nss_status

Modified: fsf/trunk/libc/libio/freopen.c
==============================================================================
--- fsf/trunk/libc/libio/freopen.c (original)
+++ fsf/trunk/libc/libio/freopen.c Fri May 20 00:03:31 2011
@@ -102,7 +102,7 @@
 	      if (errno == ENOSYS)
 		__have_dup3 = -1;
 
-	      dup2 (_IO_fileno (result), fd);
+	      __dup2 (_IO_fileno (result), fd);
 	      if ((result->_flags2 & _IO_FLAGS2_CLOEXEC) != 0)
 		__fcntl (fd, F_SETFD, FD_CLOEXEC);
 	    }

Modified: fsf/trunk/libc/libio/freopen64.c
==============================================================================
--- fsf/trunk/libc/libio/freopen64.c (original)
+++ fsf/trunk/libc/libio/freopen64.c Fri May 20 00:03:31 2011
@@ -86,7 +86,7 @@
 	      if (errno == ENOSYS)
 		__have_dup3 = -1;
 
-	      dup2 (_IO_fileno (result), fd);
+	      __dup2 (_IO_fileno (result), fd);
 	      if ((result->_flags2 & _IO_FLAGS2_CLOEXEC) != 0)
 		__fcntl (fd, F_SETFD, FD_CLOEXEC);
 	    }