projects
/
platform
/
upstream
/
glib.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4033c61
)
g_cond_timed_wait: support NULL time parameter
author
Ryan Lortie
<desrt@desrt.ca>
Fri, 14 Oct 2011 04:00:14 +0000
(
00:00
-0400)
committer
Ryan Lortie
<desrt@desrt.ca>
Fri, 14 Oct 2011 04:00:14 +0000
(
00:00
-0400)
It was undocumented, but this used to mean "wait forever". Looks like
we have some uses of this internally and there may be others in the
wild...
glib/deprecated/gthread-deprecated.c
patch
|
blob
|
history
diff --git
a/glib/deprecated/gthread-deprecated.c
b/glib/deprecated/gthread-deprecated.c
index
8e3ec15
..
f7d0cb5
100644
(file)
--- a/
glib/deprecated/gthread-deprecated.c
+++ b/
glib/deprecated/gthread-deprecated.c
@@
-1551,6
+1551,12
@@
g_cond_timed_wait (GCond *cond,
{
gint64 end_time;
+ if (abs_time == NULL)
+ {
+ g_cond_wait (cond, mutex);
+ return TRUE;
+ }
+
end_time = abs_time->tv_sec;
end_time *= 1000000;
end_time += abs_time->tv_usec;