aboutsummaryrefslogtreecommitdiff
path: root/src/platform/posix/posix_synch.c
diff options
context:
space:
mode:
authorGarrett D'Amore <garrett@damore.org>2016-12-23 08:42:12 -0800
committerGarrett D'Amore <garrett@damore.org>2016-12-23 08:42:12 -0800
commit04ec0775f86cd9eb2335def3c910c0d538a2bbb0 (patch)
tree0b9e6284fb1991febac88d3247487f9fd3d31697 /src/platform/posix/posix_synch.c
parent229d4c7decb71fd607aaec14ecbae81e380cc700 (diff)
downloadnng-04ec0775f86cd9eb2335def3c910c0d538a2bbb0.tar.gz
nng-04ec0775f86cd9eb2335def3c910c0d538a2bbb0.tar.bz2
nng-04ec0775f86cd9eb2335def3c910c0d538a2bbb0.zip
Try to satisfy uncrustify version differences. Make test use verbose by default.
Diffstat (limited to 'src/platform/posix/posix_synch.c')
-rw-r--r--src/platform/posix/posix_synch.c8
1 files changed, 4 insertions, 4 deletions
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 <time.h>
#include <string.h>
-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);