Fri Jul 24 03:00:25 1998 Ross Johnson <rpj@ixobrychus.canberra.edu.au>

	* attr.c (pthread_attr_destroy):  Fix merge conflicts.
	(pthread_attr_getdetachstate):  Fix merge conflicts.
	(pthread_attr_setdetachstate):  Fix merge conflicts.

	* pthread.h:  Fix merge conflicts.

	* sync.c (pthread_join): Fix merge conflicts.

1 files changed, 5 insertions, 5 deletions

diff --git a/private.c b/private.c
index 4e5f9ed..e65e95e 100644
--- a/private.c
+++ b/private.c
@@ -92,12 +92,12 @@ _pthread_find_thread_entry(pthread_t thread)
 	  /* Wrap to top of table. */
 	  this = _pthread_threads_table;
 	}
+    }
 
-      if (this->thread == NULL || this == start)
-	{
-	  /* Failed to find the thread. */
-	  return -1;
-	}
+  if (this->thread == NULL || this == start)
+    {
+      /* Failed to find the thread. */
+      return -1;
     }
 
   return this;