2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 0027b91..f351b15 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 Sun Jul 26 00:09:59 1998  Ross Johnson  <rpj@ixobrychus.canberra.edu.au>
 
+	* cancel.c (pthread_setcancelstate): Fix indirection bug and rename
+	"this" to "us".
+
 	* signal.c (pthread_sigmask): Rename "this" to "us" and fix some
 	minor syntax errors. Declare "us" and initialise it.
 
diff --git a/cancel.c b/cancel.c
index 1b48b28..8974e5c 100644
--- a/cancel.c
+++ b/cancel.c
@@ -12,7 +12,7 @@ int
 pthread_setcancelstate(int state,
 		       int *oldstate)
 {
-  _pthread_threads_thread_t * this = *_PTHREAD_THIS;
+  _pthread_threads_thread_t * us = _PTHREAD_THIS;
 
   /* Validate the new cancellation state. */
   if (state != PTHREAD_CANCEL_ENABLE 
@@ -23,10 +23,10 @@ pthread_setcancelstate(int state,
 
   if (oldstate != NULL)
     {
-      *oldstate = this->cancelstate;
+      *oldstate = us->cancelstate;
     }
 
-  this->cancelstate = state;
+  us->cancelstate = state;
   return 0;
 }