Sun Jul 26 00:09:59 1998 Ross Johnson <rpj@ixobrychus.canberra.edu.au>

	* signal.c (pthread_sigmask): Rename "this" to "us" and fix some
	minor syntax errors. Declare "us" and initialise it.

	* sync.c (pthread_detach): Rename "this" to "target".

3 files changed, 9 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 1d2affd..0027b91 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 Sun Jul 26 00:09:59 1998  Ross Johnson  <rpj@ixobrychus.canberra.edu.au>
 
+	* signal.c (pthread_sigmask): Rename "this" to "us" and fix some
+	minor syntax errors. Declare "us" and initialise it.
+
+	* sync.c (pthread_detach): Rename "this" to "target".
+
 	* pthread.h: Converting PTHREAD_* defines to alias the (const int)
 	values in global.c.
 
diff --git a/signal.c b/signal.c
index d7ec7ae..888319d 100644
--- a/signal.c
+++ b/signal.c
@@ -35,13 +35,14 @@ pthread_sigmask(int how, const sigset_t *set, sigset_t *oset)
 
   if (set != NULL)
     {
+      _pthread_threads_thread_t * us = _PTHREAD_THIS;
       int i;
 	
       /* FIXME: this code assumes that sigmask is an even multiple of
 	 the size of a long integer. */ 
          
       unsigned long *src = set;
-      unsigned long *dest = this->attr->sigmask;
+      unsigned long *dest = us->attr.sigmask;
 
       switch (how)
 	{
@@ -60,7 +61,7 @@ pthread_sigmask(int how, const sigset_t *set, sigset_t *oset)
 	    }
 	case SIG_SET:
 	  /* Replace the whole sigmask. */
-	  memcpy(this->attr.sigmask, set, sizeof(sigset_t));
+	  memcpy(us->attr.sigmask, set, sizeof(sigset_t));
 	  break;
 	}
     }
diff --git a/sync.c b/sync.c
index 49efcdf..721574e 100644
--- a/sync.c
+++ b/sync.c
@@ -188,7 +188,7 @@ pthread_detach(pthread_t thread)
 	  /* This is all we do here - the rest is done either when the
 	     thread exits or when pthread_join() exits. Once this is
 	     set it will never be unset. */
-	  pthread_attr_setdetachedstate(&(this->attr), 
+	  pthread_attr_setdetachedstate(&(target->attr), 
 					PTHREAD_CREATE_DETACHED);
 
 	  ret = 0;