From: Bruno Haible <bruno@clisp.org>
Date: Tue, 14 Oct 2008 01:40:49 +0000 (+0200)
Subject: Fix syntax error in native Win32 code.
X-Git-Tag: v0.1~6846
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=44a64be5593bf0c5b49de64dd8204114eab7b521;p=gnulib.git

Fix syntax error in native Win32 code.
---

diff --git a/ChangeLog b/ChangeLog
index f3fa73431..de36adf82 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-10-13  Bruno Haible  <bruno@clisp.org>
+
+	* lib/glthread/cond.c (glthread_cond_wait_func,
+	glthread_cond_timedwait_func): Fix variable name.
+	Reported by Yoann Vandoorselaere <yoann@prelude-ids.org>.
+
 2008-10-13  Paolo Bonzini  <bonzini@gnu.org>
 
 	fix getaddrinfo emulation for systems with struct sockaddr.sa_len
diff --git a/lib/glthread/cond.c b/lib/glthread/cond.c
index c35272e7c..fe023f807 100644
--- a/lib/glthread/cond.c
+++ b/lib/glthread/cond.c
@@ -179,7 +179,7 @@ glthread_cond_wait_func (gl_cond_t *cond, gl_lock_t *lock)
 	LeaveCriticalSection (&cond->lock);
 
 	return (err ? err :
-		ret == WAIT_OBJECT_0 ? 0 :
+		result == WAIT_OBJECT_0 ? 0 :
 		/* WAIT_FAILED shouldn't happen */ EAGAIN);
       }
     }
@@ -305,8 +305,8 @@ glthread_cond_timedwait_func (gl_cond_t *cond, gl_lock_t *lock, struct timespec
 	LeaveCriticalSection (&cond->lock);
 
 	return (err ? err :
-		ret == WAIT_OBJECT_0 ? 0 :
-		ret == WAIT_TIMEOUT ? ETIMEDOUT :
+		result == WAIT_OBJECT_0 ? 0 :
+		result == WAIT_TIMEOUT ? ETIMEDOUT :
 		/* WAIT_FAILED shouldn't happen */ EAGAIN);
       }
     }