[commits] r9349 - in /fsf/trunk/libc: ChangeLog sysdeps/unix/sysv/linux/ptsname.c

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Fri Nov 27 00:04:59 2009
New Revision: 9349

Log:
Import glibc-mainline for 2009-11-27

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/sysdeps/unix/sysv/linux/ptsname.c

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Fri Nov 27 00:04:59 2009
@@ -1,3 +1,9 @@
+2009-11-26  Ulrich Drepper  <drepper@xxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/ptsname.c (__ptsname_internal): Avoid code
+	only used on truly ancient kernel if configuration requires a more
+	recent kernel.
+
 2009-11-24  Ulrich Drepper  <drepper@xxxxxxxxxx>
 
 	[BZ #3662]

Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/ptsname.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/ptsname.c (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/ptsname.c Fri Nov 27 00:04:59 2009
@@ -128,10 +128,12 @@
 	}
 
       ptyno = minor (stp->st_rdev);
+#if __LINUX_KERNEL_VERSION >= 131443
       /* This is for the old BSD pseudo terminals.  As of Linux
 	 2.1.115 these are no longer supported.  */
       if (major (stp->st_rdev) == 4)
 	ptyno -= 128;
+#endif
 
       if (ptyno / 16 >= strlen (__libc_ptyname1))
 	{