As per Havoc's review, rename DBUS_GNUC_EXTENSION to _DBUS_GNUC_EXTENSION.

Also update ChangeLog.

diff --git a/ChangeLog b/ChangeLog
index e76969f..934e873 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+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".
+
 2007-10-10  Simon McVittie  <simon.mcvittie@collabora.co.uk>
 
        * dbus/dbus-errors.c, dbus/dbus-protocol.h: Add new error

diff --git a/dbus/dbus-arch-deps.h.in b/dbus/dbus-arch-deps.h.in
index a5180bd..ca8e286 100644 (file)
--- a/dbus/dbus-arch-deps.h.in
+++ b/dbus/dbus-arch-deps.h.in
@@ -33,11 +33,11 @@ DBUS_BEGIN_DECLS
 
 #if @DBUS_HAVE_INT64@
 #define DBUS_HAVE_INT64 1
-DBUS_GNUC_EXTENSION typedef @DBUS_INT64_TYPE@ dbus_int64_t;
-DBUS_GNUC_EXTENSION typedef unsigned @DBUS_INT64_TYPE@ dbus_uint64_t;
+_DBUS_GNUC_EXTENSION typedef @DBUS_INT64_TYPE@ dbus_int64_t;
+_DBUS_GNUC_EXTENSION typedef unsigned @DBUS_INT64_TYPE@ dbus_uint64_t;
 
-#define DBUS_INT64_CONSTANT(val)  (DBUS_GNUC_EXTENSION @DBUS_INT64_CONSTANT@)
-#define DBUS_UINT64_CONSTANT(val) (DBUS_GNUC_EXTENSION @DBUS_UINT64_CONSTANT@)
+#define DBUS_INT64_CONSTANT(val)  (_DBUS_GNUC_EXTENSION @DBUS_INT64_CONSTANT@)
+#define DBUS_UINT64_CONSTANT(val) (_DBUS_GNUC_EXTENSION @DBUS_UINT64_CONSTANT@)
 
 #else
 #undef DBUS_HAVE_INT64

diff --git a/dbus/dbus-macros.h b/dbus/dbus-macros.h
index 1ed6ea7..bf004b8 100644 (file)
--- a/dbus/dbus-macros.h
+++ b/dbus/dbus-macros.h
@@ -59,9 +59,9 @@
 #endif
 
 #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 8)
-#  define DBUS_GNUC_EXTENSION __extension__
+#  define _DBUS_GNUC_EXTENSION __extension__
 #else
-#  define DBUS_GNUC_EXTENSION
+#  define _DBUS_GNUC_EXTENSION
 #endif
 
 /* Normally docs are in .c files, but there isn't a .c file for this. */
@@ -125,10 +125,11 @@
  * D-Bus internal.
  */
 /**
- * @def DBUS_GNUC_EXTENSION
+ * @def _DBUS_GNUC_EXTENSION
  *
  * Tells gcc not to warn about extensions to the C standard in the
- * following expression, even if compiling with -pedantic.
+ * following expression, even if compiling with -pedantic. Do not use
+ * this macro in your own code; please consider it to be internal to libdbus.
  */
 
 /** @} */