* thread.h (List_remove): Revert most of 2005-05-30 change.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index a7f8fd2..f02f760 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,5 +1,9 @@
 2005-06-01  Christopher Faylor  <cgf@timesys.com>
 
+       * thread.h (List_remove): Revert most of 2005-05-30 change.
+
+2005-06-01  Christopher Faylor  <cgf@timesys.com>
+
        * cygwin.sc: Don't output .reloc or .rsrc sections.  Clean up stuff
        around .cygheap and use a workaround to get things working with newer
        (broken?) binutils.

diff --git a/winsup/cygwin/thread.h b/winsup/cygwin/thread.h
index e053503..8bd8b25 100644 (file)
--- a/winsup/cygwin/thread.h
+++ b/winsup/cygwin/thread.h
@@ -143,9 +143,7 @@ List_remove (fast_mutex &mx, list_node *&head, list_node const *node)
   mx.lock ();
   if (head)
     {
-      if (head == node)
-        head = head->next;
-      else
+      if (InterlockedCompareExchangePointer (&head, node->next, node) != node)
        {
          list_node *cur = head;