summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn (J5) Palmieri <johnp@redhat.com>2006-11-14 18:54:39 +0000
committerJohn (J5) Palmieri <johnp@redhat.com>2006-11-14 18:54:39 +0000
commit969ae9d7a65b12fa50acec205f0c941dcf1045a5 (patch)
treedd979f51e6a15ff01aa6cf035e298b803ae1f68c
parentaceedc463b162d604263dd83088a503964c33d99 (diff)
* configure.in: Bump version to 1.0.1 for next stable release
* dbus/dbus-threads.h: fix DBUS_THREAD_FUNCTIONS_ALL_MASK to have the correct value so we don't assert when initalizing recursive threads * test/name-test/test-thread-init.c: call dbus_threads_init_default instead of _dbus_threads_init_debug since it is more of a real world test
-rw-r--r--ChangeLog11
-rw-r--r--configure.in2
-rw-r--r--dbus/dbus-threads.h2
-rw-r--r--test/name-test/test-threads-init.c2
4 files changed, 14 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index eab5982f..c3bdd03b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2006-11-14 John (J5) Palmieri <johnp@redhat.com>
+
+ * configure.in: Bump version to 1.0.1 for next stable release
+
+ * dbus/dbus-threads.h: fix DBUS_THREAD_FUNCTIONS_ALL_MASK to have
+ the correct value so we don't assert when initalizing recursive threads
+
+ * test/name-test/test-thread-init.c: call dbus_threads_init_default
+ instead of _dbus_threads_init_debug since it is more of a real world
+ test
+
2006-11-09 John (J5) Palmieri <johnp@redhat.com>
* Released 1.0.0
diff --git a/configure.in b/configure.in
index 0c3e80c8..1524f7a4 100644
--- a/configure.in
+++ b/configure.in
@@ -5,7 +5,7 @@ AC_INIT(dbus/dbus.h)
AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE(dbus, 1.0.0)
+AM_INIT_AUTOMAKE(dbus, 1.0.1)
AM_CONFIG_HEADER(config.h)
diff --git a/dbus/dbus-threads.h b/dbus/dbus-threads.h
index 1cf533d6..2a7b32c3 100644
--- a/dbus/dbus-threads.h
+++ b/dbus/dbus-threads.h
@@ -134,7 +134,7 @@ typedef enum
DBUS_THREAD_FUNCTIONS_RECURSIVE_MUTEX_FREE_MASK = 1 << 11,
DBUS_THREAD_FUNCTIONS_RECURSIVE_MUTEX_LOCK_MASK = 1 << 12,
DBUS_THREAD_FUNCTIONS_RECURSIVE_MUTEX_UNLOCK_MASK = 1 << 13,
- DBUS_THREAD_FUNCTIONS_ALL_MASK = (1 << 13) - 1
+ DBUS_THREAD_FUNCTIONS_ALL_MASK = (1 << 14) - 1
} DBusThreadFunctionsMask;
/**
diff --git a/test/name-test/test-threads-init.c b/test/name-test/test-threads-init.c
index f059993b..8cda413c 100644
--- a/test/name-test/test-threads-init.c
+++ b/test/name-test/test-threads-init.c
@@ -140,7 +140,7 @@ main (int argc, char *argv[])
check_condvar_lock (dispatch_cond1, dispatch_cond2, TRUE);
check_condvar_lock (io_path_cond1, io_path_cond2, TRUE);
- _dbus_threads_init_debug ();
+ dbus_threads_init_default ();
_dbus_connection_test_get_locks (conn, &mutex1,
&dispatch_mutex1,