projects
/
mono.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7060256
)
mono_os_cond_timedwait: fix function name in g_error string (#3407)
author
Craig McQueen
<work@craig.mcqueen.id.au>
Wed, 17 Aug 2016 07:42:48 +0000
(17:42 +1000)
committer
Zoltan Varga
<vargaz@gmail.com>
Wed, 17 Aug 2016 07:42:48 +0000
(09:42 +0200)
It should say gettimeofday, not pthread_cond_timedwait. (This appears to
be a copy-and-paste error.)
mono/utils/mono-os-mutex.h
patch
|
blob
|
history
diff --git
a/mono/utils/mono-os-mutex.h
b/mono/utils/mono-os-mutex.h
index ece9bd410f6142aa38b59773fbdd144ed1d60c07..52cef09d84bcb8f84b3ed15d22b179ea516a94ef 100644
(file)
--- a/
mono/utils/mono-os-mutex.h
+++ b/
mono/utils/mono-os-mutex.h
@@
-169,7
+169,7
@@
mono_os_cond_timedwait (mono_cond_t *cond, mono_mutex_t *mutex, guint32 timeout_
res = gettimeofday (&tv, NULL);
if (G_UNLIKELY (res != 0))
- g_error ("%s:
pthread_cond_timedwait
failed with \"%s\" (%d)", __func__, g_strerror (errno), errno);
+ g_error ("%s:
gettimeofday
failed with \"%s\" (%d)", __func__, g_strerror (errno), errno);
tv.tv_sec += timeout_ms / 1000;
usecs = tv.tv_usec + ((timeout_ms % 1000) * 1000);