diff options
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | configure.in | 1 | ||||
| -rw-r--r-- | libc.map | 2 | ||||
| -rw-r--r-- | linuxthreads/ChangeLog | 3 | ||||
| -rw-r--r-- | linuxthreads/sysdeps/pthread/pthread.h | 4 | ||||
| -rw-r--r-- | manual/terminal.texi | 8 |
6 files changed, 12 insertions, 7 deletions
diff --git a/Makefile b/Makefile index fdfc6d7ca8..8152e59c5f 100644 --- a/Makefile +++ b/Makefile @@ -308,5 +308,6 @@ headers2_0 := __math.h bytesex.h confname.h direntry.h elfclass.h \ sys/kernel_termios.h sys/msq_buf.h sys/sem_buf.h \ sys/shm_buf.h sys/socketcall.h +.PHONY: remove-old-headers remove-old-headers: rm -f $(addprefix $(inst_includedir)/, $(headers2_0)) diff --git a/configure.in b/configure.in index 997cace59b..7dc7d4b560 100644 --- a/configure.in +++ b/configure.in @@ -1115,6 +1115,7 @@ if test ${old_glibc_headers} = yes; then AC_MSG_WARN(*** During \"make install\" old headers from glibc 2.0.x will) AC_MSG_WARN(*** be removed.) fi +AC_SUBST(old_glibc_headers) AC_SUBST(libc_cv_slibdir) AC_SUBST(libc_cv_sysconfdir) diff --git a/libc.map b/libc.map index 0def83f777..314bd8b959 100644 --- a/libc.map +++ b/libc.map @@ -15,7 +15,7 @@ GLIBC_2.0 { _IO_list_all; _IO_stderr_; _IO_stdin_; _IO_stdout_; - __libc_pid; __libc_uid; + __libc_pid; # This is for sparc only. .div; .mul; .rem; .udiv; .umul; .urem; diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog index b4f2ae61b3..02d5f8eabf 100644 --- a/linuxthreads/ChangeLog +++ b/linuxthreads/ChangeLog @@ -1,5 +1,8 @@ 1998-06-26 Ulrich Drepper <drepper@cygnus.com> + * sysdeps/pthread/pthread.h (PTHREAD_RWLOCK_INITIALIZER): Correct + for new definition of pthread_rwlock_t. + * spinlock.c: Correct test whether to compile __pthread_compare_and_swap or not. diff --git a/linuxthreads/sysdeps/pthread/pthread.h b/linuxthreads/sysdeps/pthread/pthread.h index 127e15deef..b76c4a8d5b 100644 --- a/linuxthreads/sysdeps/pthread/pthread.h +++ b/linuxthreads/sysdeps/pthread/pthread.h @@ -46,7 +46,7 @@ typedef struct _pthread_descr_struct *_pthread_descr; /* Fast locks (not abstract because mutexes and conditions aren't abstract). */ struct _pthread_fastlock { - long status; /* "Free" or "taken" or head of waiting list */ + long int status; /* "Free" or "taken" or head of waiting list */ int spinlock; /* For compare-and-swap emulation */ }; @@ -91,7 +91,7 @@ typedef struct } pthread_rwlock_t; # define PTHREAD_RWLOCK_INITIALIZER \ - { 0, 0, 0, {0, 0}, {0, 0}, \ + { {0, 0}, 0, NULL, NULL, NULL, \ PTHREAD_RWLOCK_DEFAULT_NP, PTHREAD_PROCESS_PRIVATE } #endif diff --git a/manual/terminal.texi b/manual/terminal.texi index 14dda44645..217cfc5053 100644 --- a/manual/terminal.texi +++ b/manual/terminal.texi @@ -1983,7 +1983,7 @@ open_pty_pair (int *amaster, int *aslave) if (name == NULL) goto close_master; - slave open (name, O_RDWR); + slave = open (name, O_RDWR); if (slave == -1) goto close_master; @@ -2043,9 +2043,9 @@ device instead. @comment BSD @deftypefun int forkpty (int *@var{amaster}, char *@var{name}, struct termios *@var{termp}, struct winsize *@var{winp}) This function is similar to the @code{openpty} function, but in -addition, forks creates a new process (@pxref{Creating a Process}) and -makes the newly opened slave pseudo-terminal device the controlling -terminal (@pxref{Controlling Terminal}) for the child process. +addition, forks a new process (@pxref{Creating a Process}) and makes the +newly opened slave pseudo-terminal device the controlling terminal +(@pxref{Controlling Terminal}) for the child process. If the operation is successful, there are then both parent and child processes and both see @code{forkpty} return, but with different values: |