projects
/
gnulib.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3b8caea
)
Fix syntax error in native Win32 code.
author
Bruno Haible
<bruno@clisp.org>
Tue, 14 Oct 2008 01:40:49 +0000
(
03:40
+0200)
committer
Bruno Haible
<bruno@clisp.org>
Tue, 14 Oct 2008 01:40:49 +0000
(
03:40
+0200)
ChangeLog
patch
|
blob
|
history
lib/glthread/cond.c
patch
|
blob
|
history
diff --git
a/ChangeLog
b/ChangeLog
index
f3fa734
..
de36adf
100644
(file)
--- 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
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
c35272e
..
fe023f8
100644
(file)
--- 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 :
LeaveCriticalSection (&cond->lock);
return (err ? err :
- ret == WAIT_OBJECT_0 ? 0 :
+ re
sul
t == WAIT_OBJECT_0 ? 0 :
/* WAIT_FAILED shouldn't happen */ EAGAIN);
}
}
/* 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 :
LeaveCriticalSection (&cond->lock);
return (err ? err :
- ret == WAIT_OBJECT_0 ? 0 :
- ret == WAIT_TIMEOUT ? ETIMEDOUT :
+ re
sul
t == WAIT_OBJECT_0 ? 0 :
+ re
sul
t == WAIT_TIMEOUT ? ETIMEDOUT :
/* WAIT_FAILED shouldn't happen */ EAGAIN);
}
}
/* WAIT_FAILED shouldn't happen */ EAGAIN);
}
}