summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Habacker <ralf.habacker@freenet.de>2006-12-13 17:14:24 +0000
committerRalf Habacker <ralf.habacker@freenet.de>2006-12-13 17:14:24 +0000
commit3ec4b0f0238f65ed253644a1953cef9e351a3f71 (patch)
treeddcf40ef4b0e5a8ca5f0b2e0c1fc431e2685e596
parentb88d6bad1c5c0cd44c9c0a0c5a4f2ee7ba48d908 (diff)
2006-12-13 Ralf Habacker <ralf.habacker@freenet.de>
* dbus/dbus-sysdeps-win-thread.c (_dbus_condvar_wait_win32): correctness fix. - Patch from Christian Ehrlicher
-rw-r--r--ChangeLog5
-rw-r--r--dbus/dbus-sysdeps-win-thread.c5
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 6d9f5ed9..7a4ce8b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2006-12-13 Ralf Habacker <ralf.habacker@freenet.de>
+ * dbus/dbus-sysdeps-win-thread.c (_dbus_condvar_wait_win32):
+ correctness fix. - Patch from Christian Ehrlicher
+
+2006-12-13 Ralf Habacker <ralf.habacker@freenet.de>
+
* dbus/dbus-internals.h: msvc also knows about __FUNCTION__,
we should also use it. - Patch from Christian Ehrlicher
diff --git a/dbus/dbus-sysdeps-win-thread.c b/dbus/dbus-sysdeps-win-thread.c
index e0a51031..acab9ba7 100644
--- a/dbus/dbus-sysdeps-win-thread.c
+++ b/dbus/dbus-sysdeps-win-thread.c
@@ -24,6 +24,7 @@
#include "dbus-internals.h"
#include "dbus-sysdeps.h"
#include "dbus-threads.h"
+#include "dbus-list.h"
#include <windows.h>
@@ -172,7 +173,7 @@ _dbus_condvar_wait_win32 (DBusCondVar *cond,
EnterCriticalSection (&cond->lock);
/* Now event must not be inside the array, check this */
- _dbus_assert (_dbus_list_remove (cond->list, event) == FALSE);
+ _dbus_assert (_dbus_list_remove (&cond->list, event) == FALSE);
LeaveCriticalSection (&cond->lock);
#endif /* !G_DISABLE_ASSERT */
@@ -241,7 +242,7 @@ static const DBusThreadFunctions windows_functions =
_dbus_windows_condvar_wake_all
};
-void
+dbus_bool_t
_dbus_threads_init_platform_specific (void)
{
/* We reuse this over several generations, because we can't