2003-02-21 Anders Carlsson <andersca@codefactory.se>

	* dbus/dbus-mempool.c (_dbus_mem_pool_new): Make the
	element size at least 8 bytes, fixes mempool tests on
	64-bit machines.

diff --git a/ChangeLog b/ChangeLog
index 070196df3ba1f89d45b1b3254b935b52f6e4a4a0..f587072f85cbd09ee2727974223d3c05be4bb22a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-02-21  Anders Carlsson  <andersca@codefactory.se>
+
+       * dbus/dbus-mempool.c (_dbus_mem_pool_new): Make the
+       element size at least 8 bytes, fixes mempool tests on
+       64-bit machines.
+
 2003-02-20  Alexander Larsson  <alexl@redhat.com>
 
        * dbus/dbus-transport-unix.c (unix_do_iteration):

diff --git a/dbus/dbus-mempool.c b/dbus/dbus-mempool.c
index 0d62e62b20d5a030fd7a6bf43004df735cf1ea3d..2fde25686239442cacad5328d9e2de162bffbe29 100644 (file)
--- a/dbus/dbus-mempool.c
+++ b/dbus/dbus-mempool.c
@@ -139,6 +139,10 @@ _dbus_mem_pool_new (int element_size,
   if (pool == NULL)
     return NULL;
 
+  /* Make the element size at least 8 bytes. */
+  if (element_size < 8)
+    element_size = 8;
+  
   /* these assertions are equivalent but the first is more clear
    * to programmers that see it fail.
    */