From a1f8ec97fdaf3e0636957bfc3861651869c60b40 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Thu, 16 Jan 2003 18:14:10 +0000 Subject: [PATCH] Update. 2003-01-15 Dmitry V. Levin * sysdeps/unix/sysv/linux/ptsname.c: Fix typo in comment. --- ChangeLog | 4 ++++ linuxthreads/ChangeLog | 5 +++++ linuxthreads/sysdeps/i386/tls.h | 4 ++-- nptl/sysdeps/i386/tls.h | 4 ++-- sysdeps/unix/sysv/linux/ptsname.c | 2 +- 5 files changed, 14 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index f1dc2a32c1..bef7079134 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2003-01-15 Dmitry V. Levin + + * sysdeps/unix/sysv/linux/ptsname.c: Fix typo in comment. + 2003-01-16 Jakub Jelinek * posix/regcomp.c (re_compile_internal): If clearing buffer, clear diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog index fdcf98d2db..6a844b928c 100644 --- a/linuxthreads/ChangeLog +++ b/linuxthreads/ChangeLog @@ -1,3 +1,8 @@ +2003-01-16 Jakub Jelinek + + * sysdeps/i386/tls.h (INIT_SYSINFO): Initialize head->sysinfo even + if not SHARED. + 2003-01-15 Jakub Jelinek * sysdeps/pthread/bits/libc-lock.h (__libc_lock_init, diff --git a/linuxthreads/sysdeps/i386/tls.h b/linuxthreads/sysdeps/i386/tls.h index 216ba554f6..118c9c02d1 100644 --- a/linuxthreads/sysdeps/i386/tls.h +++ b/linuxthreads/sysdeps/i386/tls.h @@ -1,5 +1,5 @@ /* Definition for thread-local data handling. linuxthreads/i386 version. - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002, 2003 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -182,7 +182,7 @@ TLS_DO_MODIFY_LDT_KERNEL_CHECK( \ TLS_DO_MODIFY_LDT ((descr), 0) # endif -#if defined NEED_DL_SYSINFO && defined SHARED +#if defined NEED_DL_SYSINFO # define INIT_SYSINFO \ head->sysinfo = GL(dl_sysinfo) #else diff --git a/nptl/sysdeps/i386/tls.h b/nptl/sysdeps/i386/tls.h index f830db78dc..c4bd1def8a 100644 --- a/nptl/sysdeps/i386/tls.h +++ b/nptl/sysdeps/i386/tls.h @@ -1,5 +1,5 @@ /* Definition for thread-local data handling. nptl/i386 version. - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002, 2003 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -161,7 +161,7 @@ union user_desc_init # define TLS_LOAD_EBX # endif -#if defined NEED_DL_SYSINFO && defined SHARED +#if defined NEED_DL_SYSINFO # define INIT_SYSINFO \ _head->sysinfo = GL(dl_sysinfo) #else diff --git a/sysdeps/unix/sysv/linux/ptsname.c b/sysdeps/unix/sysv/linux/ptsname.c index da4809f372..9c364b18b4 100644 --- a/sysdeps/unix/sysv/linux/ptsname.c +++ b/sysdeps/unix/sysv/linux/ptsname.c @@ -35,7 +35,7 @@ || (major ((Dev)) == 4 && minor ((Dev)) >= 128 && minor ((Dev)) < 192) \ || (major ((Dev)) >= 128 && major ((Dev)) < 136)) -/* Check if DEV corresponds to a master pseudo terminal device. */ +/* Check if DEV corresponds to a slave pseudo terminal device. */ #define SLAVE_P(Dev) \ (major ((Dev)) == 3 \ || (major ((Dev)) == 4 && minor ((Dev)) >= 192 && minor ((Dev)) < 256) \ -- 2.43.5