From 04ec0775f86cd9eb2335def3c910c0d538a2bbb0 Mon Sep 17 00:00:00 2001 From: Garrett D'Amore Date: Fri, 23 Dec 2016 08:42:12 -0800 Subject: Try to satisfy uncrustify version differences. Make test use verbose by default. --- src/platform/posix/posix_synch.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/platform/posix/posix_synch.c') diff --git a/src/platform/posix/posix_synch.c b/src/platform/posix/posix_synch.c index e693a641..a08dfdf5 100644 --- a/src/platform/posix/posix_synch.c +++ b/src/platform/posix/posix_synch.c @@ -18,13 +18,13 @@ #include #include -extern pthread_condattr_t nni_condattr; -extern pthread_mutexattr_t nni_mutexattr; +extern pthread_condattr_t nni_cvattr; +extern pthread_mutexattr_t nni_mxattr; int nni_mutex_init(nni_mutex *mp) { - if (pthread_mutex_init(&mp->mx, &nni_mutexattr) != 0) { + if (pthread_mutex_init(&mp->mx, &nni_mxattr) != 0) { return (NNG_ENOMEM); } return (0); @@ -73,7 +73,7 @@ nni_mutex_tryenter(nni_mutex *m) int nni_cond_init(nni_cond *c, nni_mutex *m) { - if (pthread_cond_init(&c->cv, &nni_condattr) != 0) { + if (pthread_cond_init(&c->cv, &nni_cvattr) != 0) { // In theory could be EAGAIN, but handle like ENOMEM nni_free(c, sizeof (*c)); return (NNG_ENOMEM); -- cgit v1.2.3-70-g09d2