Merge branch 'atomic'

Conflicts:

	ChangeLog

diff --cc ChangeLog
index 9b7f598,4056ac1..2f52bc4
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,18 -1,10 +1,23 @@@
  2007-10-11  Simon McVittie  <simon.mcvittie@collabora.co.uk>
  
 +      * dbus/dbus-macros.h, dbus/dbus-arch-deps.h.in: Use new macro
 +      _DBUS_GNUC_EXTENSION (the same as G_GNUC_EXTENSION) to avoid -ansi
 +      warnings about use of "long long".
 +      * dbus/dbus-server-socket.c: remove unused variable when assertions
 +      are disabled
 +      * dbus/dbus-marshal-validate.c: avoid empty statements by removing
 +      stray semicolons
 +      * tools/dbus-launch.c: convert C++-style comment to C-style, add {}
 +      for clarity
 +      * .gitignore: ignore vi swapfiles
 +      * dbus/dbus-errors.h, dbus/dbus-errors.c: Add DBUS_ERROR_INIT macro
 +      for the benefit of libdbus users whose coding style allows initialized
 +      variables (although dbus core coding style doesn't)
+       * configure.in, dbus/dbus-sysdeps.h, dbus/dbus-sysdeps-unix.c: Fix
+       detection of i486 atomic ops. Previously, the attempts to determine
+       support at compile-time on Darwin were causing the i486 atomic ops to
+       be used on *all* i386 or x86-64 GCC builds (AH_VERBATIM can't be
+       conditionalized like we were trying to).
  
  2007-10-10  Simon McVittie  <simon.mcvittie@collabora.co.uk>