2003-05-15 Havoc Pennington <hp@redhat.com>

	* dbus/dbus-sysdeps.c (_dbus_atomic_dec, _dbus_atomic_inc): work
	on non-x86. ifdef's are evil.

diff --git a/ChangeLog b/ChangeLog
index 06981c202edb411a170a27cef0a62eee521563b1..2f3326d938568d6a0e5c277f82d864cf45562122 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-05-15  Havoc Pennington  <hp@redhat.com>
+
+       * dbus/dbus-sysdeps.c (_dbus_atomic_dec, _dbus_atomic_inc): work
+       on non-x86. ifdef's are evil.
+
 2003-05-15  Havoc Pennington  <hp@redhat.com>
 
        * configure.in: 0.11

diff --git a/dbus/dbus-sysdeps.c b/dbus/dbus-sysdeps.c
index e2975c30abd571bfdfc0a80b277a889f1118ccc5..ab79a72286a9e36b5faddb583cb26c87a23d9bb5 100644 (file)
--- a/dbus/dbus-sysdeps.c
+++ b/dbus/dbus-sysdeps.c
@@ -1822,11 +1822,10 @@ _dbus_atomic_inc (DBusAtomic *atomic)
 #ifdef DBUS_USE_ATOMIC_INT_486
   return atomic_exchange_and_add (atomic, 1);
 #else
-  dbus_atomic_t res;
-  
+  dbus_int32_t res;
   _DBUS_LOCK (atomic);
-  *atomic += 1;
-  res = *atomic;
+  res = atomic->value;
+  atomic->value += 1;
   _DBUS_UNLOCK (atomic);
   return res;
 #endif
@@ -1846,11 +1845,11 @@ _dbus_atomic_dec (DBusAtomic *atomic)
 #ifdef DBUS_USE_ATOMIC_INT_486
   return atomic_exchange_and_add (atomic, -1);
 #else
-  dbus_atomic_t res;
+  dbus_int32_t res;
   
   _DBUS_LOCK (atomic);
-  *atomic -= 1;
-  res = *atomic;
+  res = atomic->value;
+  atomic->value -= 1;
   _DBUS_UNLOCK (atomic);
   return res;
 #endif