From 98854988296f67186dac563cf114239e3feb8455 Mon Sep 17 00:00:00 2001
From: Christopher Faylor <me@cgf.cx>
Date: Mon, 30 May 2005 18:37:41 +0000
Subject: [PATCH] * thread.h (List_remove): Make node parameter const.  Use
 simple comparison and assignment rather than
 InterlockedCompareExchangePointer since access is already synchronized.

---
 winsup/cygwin/ChangeLog | 6 ++++++
 winsup/cygwin/thread.h  | 6 ++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 4e0e50751..924a907aa 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,9 @@
+2005-05-30  Vaclav Haisman  <v.haisman@sh.cvut.cz>
+
+	* thread.h (List_remove): Make node parameter const.  Use simple
+	comparison and assignment rather than InterlockedCompareExchangePointer
+	since access is already synchronized.
+
 2005-05-30  Christopher Faylor  <cgf@timesys.com>
 
 	* dlfcn.cc (set_dl_error): Use UNIX error rather than Windows error.
diff --git a/winsup/cygwin/thread.h b/winsup/cygwin/thread.h
index be2ada6bc..e0535033b 100644
--- a/winsup/cygwin/thread.h
+++ b/winsup/cygwin/thread.h
@@ -136,14 +136,16 @@ List_insert (list_node *&head, list_node *node)
 }
 
 template <class list_node> inline void
-List_remove (fast_mutex &mx, list_node *&head, list_node *node)
+List_remove (fast_mutex &mx, list_node *&head, list_node const *node)
 {
   if (!node)
     return;
   mx.lock ();
   if (head)
     {
-      if (InterlockedCompareExchangePointer (&head, node->next, node) != node)
+      if (head == node)
+        head = head->next;
+      else
 	{
 	  list_node *cur = head;