From: Rich Felker Date: Sat, 2 Apr 2011 00:48:02 +0000 (-0400) Subject: fix misspelled PTHREAD_CANCELED constant X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=commitdiff_plain;h=3df3d4f5127a15c1237006d22f948b430f9dbe7e;ds=sidebyside fix misspelled PTHREAD_CANCELED constant --- diff --git a/include/pthread.h b/include/pthread.h index 76333669..43754ddd 100644 --- a/include/pthread.h +++ b/include/pthread.h @@ -65,7 +65,7 @@ extern "C" { #define PTHREAD_CANCEL_DEFERRED 0 #define PTHREAD_CANCEL_ASYNCHRONOUS 1 -#define PTHREAD_CANCELLED ((void *)-1) +#define PTHREAD_CANCELED ((void *)-1) #define PTHREAD_BARRIER_SERIAL_THREAD (-1) diff --git a/src/thread/pthread_create.c b/src/thread/pthread_create.c index 18ee64d6..7cd57d8e 100644 --- a/src/thread/pthread_create.c +++ b/src/thread/pthread_create.c @@ -13,7 +13,7 @@ void __pthread_unwind_next(struct __ptcb *cb) if (cb->__next) longjmp((void *)cb->__next->__jb, 1); self = pthread_self(); - if (self->cancel) self->result = PTHREAD_CANCELLED; + if (self->cancel) self->result = PTHREAD_CANCELED; LOCK(&self->exitlock);