diff options
| author | Torvald Riegel <triegel@redhat.com> | 2016-01-15 22:40:50 +0100 |
|---|---|---|
| committer | Torvald Riegel <triegel@redhat.com> | 2016-01-15 23:00:19 +0100 |
| commit | 12c3bb770dd3ea11215baf23b385dbf297a2a85c (patch) | |
| tree | 72018ab7eca6756d1ec41b3a0ed1221e99f4e4b1 | |
| parent | 72276d6e8843db6df5971b06787f0a5e39bda138 (diff) | |
| download | glibc-12c3bb770dd3ea11215baf23b385dbf297a2a85c.tar.gz glibc-12c3bb770dd3ea11215baf23b385dbf297a2a85c.tar.xz glibc-12c3bb770dd3ea11215baf23b385dbf297a2a85c.zip | |
Fix pthread_barrier_init typo.
Applies Paul Eggert's fix for BZ 18868.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | nptl/pthread_barrier_init.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 5d806648ef..13d8175bea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2016-01-15 Torvald Riegel <triegel@redhat.com> + + [BZ #18868] + * nptl/pthread_barrier_init.c (__pthread_barrier_init): Apply fix. + 2016-01-16 Andrew Senkevich <andrew.senkevich@intel.com> * sysdeps/x86_64/multiarch/Makefile (sysdep_routines): Added new files. diff --git a/nptl/pthread_barrier_init.c b/nptl/pthread_barrier_init.c index 8f89df12ca..822e17e495 100644 --- a/nptl/pthread_barrier_init.c +++ b/nptl/pthread_barrier_init.c @@ -42,7 +42,7 @@ __pthread_barrier_init (pthread_barrier_t *barrier, const struct pthread_barrierattr *iattr = (attr != NULL - ? iattr = (struct pthread_barrierattr *) attr + ? (struct pthread_barrierattr *) attr : &default_barrierattr); ibarrier = (struct pthread_barrier *) barrier; |