From: Simon McVittie Date: Thu, 11 Oct 2007 16:24:16 +0000 (+0100) Subject: Merge branch 'atomic' X-Git-Tag: dbus-1.1.3~36 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d229e579a314c6b893e0a92730f0bf644b4eabcd;p=thirdparty%2Fdbus.git Merge branch 'atomic' Conflicts: ChangeLog --- d229e579a314c6b893e0a92730f0bf644b4eabcd diff --cc ChangeLog index 9b7f59839,4056ac12e..2f52bc416 --- a/ChangeLog +++ b/ChangeLog @@@ -1,18 -1,10 +1,23 @@@ 2007-10-11 Simon McVittie + * 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