diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | nis/nis_findserv.c | 3 | ||||
| -rw-r--r-- | rt/aio_suspend.c | 5 | ||||
| -rw-r--r-- | rt/lio_listio.c | 5 | ||||
| -rw-r--r-- | rt/lio_listio64.c | 5 |
5 files changed, 14 insertions, 13 deletions
diff --git a/ChangeLog b/ChangeLog index 663971b275..9ea90402ff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +1998-04-11 Ulrich Drepper <drepper@cygnus.com> + + * rt/aio_suspend.c (aio_suspend): Use PTHREAD_COND_INITIALIZER + instead of call to pthread_cond_init. + * rt/lio_listio.c (lio_listio): Likewise. + * rt/lio_listio64.c (lio_listio64): Likewise. + + * nis/nis_findserv.c: Include sys/socket.h. + 1998-04-11 09:33 Ulrich Drepper <drepper@cygnus.com> * Makeconfig (rtobjdir): New variable. diff --git a/nis/nis_findserv.c b/nis/nis_findserv.c index 84508177e6..b6abff133d 100644 --- a/nis/nis_findserv.c +++ b/nis/nis_findserv.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1997 Free Software Foundation, Inc. +/* Copyright (C) 1997, 1998 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>, 1997. @@ -20,6 +20,7 @@ #include <string.h> #include <unistd.h> #include <sys/ioctl.h> +#include <sys/socket.h> #include <rpc/pmap_prot.h> #include <rpc/pmap_clnt.h> #include <rpcsvc/nis.h> diff --git a/rt/aio_suspend.c b/rt/aio_suspend.c index ca16342a60..70c5e1a3ce 100644 --- a/rt/aio_suspend.c +++ b/rt/aio_suspend.c @@ -42,7 +42,7 @@ aio_suspend (list, nent, timeout) { struct waitlist waitlist[nent]; struct requestlist *requestlist[nent]; - pthread_cond_t cond; + pthread_cond_t cond = PTHREAD_COND_INITIALIZER; int cnt; int result = 0; int dummy; @@ -74,9 +74,6 @@ aio_suspend (list, nent, timeout) { int oldstate; - /* Initialize the conditional variable. */ - pthread_cond_init (&cond, NULL); - /* Since `pthread_cond_wait'/`pthread_cond_timedwait' are cancelation points we must be careful. We added entries to the waiting lists which we must remove. So defer cancelation for now. */ diff --git a/rt/lio_listio.c b/rt/lio_listio.c index 07c8d3ea28..e4d972960f 100644 --- a/rt/lio_listio.c +++ b/rt/lio_listio.c @@ -82,13 +82,10 @@ lio_listio (mode, list, nent, sig) } else if (mode == LIO_WAIT) { - pthread_cond_t cond; + pthread_cond_t cond = PTHREAD_COND_INITIALIZER; struct waitlist waitlist[nent]; int oldstate; - /* Initialize the conditional variable. */ - pthread_cond_init (&cond, NULL); - total = 0; for (cnt = 0; cnt < nent; ++cnt) if (list[cnt] != NULL && list[cnt]->aio_lio_opcode != LIO_NOP diff --git a/rt/lio_listio64.c b/rt/lio_listio64.c index 69b78b79fb..9cb1125f65 100644 --- a/rt/lio_listio64.c +++ b/rt/lio_listio64.c @@ -82,13 +82,10 @@ lio_listio64 (mode, list, nent, sig) } else if (mode == LIO_WAIT) { - pthread_cond_t cond; + pthread_cond_t cond = PTHREAD_COND_INITIALIZER; struct waitlist waitlist[nent]; int oldstate; - /* Initialize the conditional variable. */ - pthread_cond_init (&cond, NULL); - total = 0; for (cnt = 0; cnt < nent; ++cnt) if (list[cnt] != NULL && list[cnt]->aio_lio_opcode != LIO_NOP |