diff options
| -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; |