Index: ChangeLog
===================================================================
RCS file: /cvs/dbus/dbus/ChangeLog,v
retrieving revision 1.1329
diff -u -r1.1329 ChangeLog
--- ChangeLog	16 Jun 2007 08:09:41 -0000	1.1329
+++ ChangeLog	17 Jun 2007 09:18:32 -0000
@@ -1,3 +1,9 @@
+2007-06-16  Ralf Habacker  <ralf.habacker@freenet.de>
+
+	* dbus/dbus-macros.h, dbus/dbus-message.c, 
+	dbus/dbus-message.h: renamed DBUS_GNUC_DEPRECATED 
+	to DBUS_DEPRECATED extended to msvc compiler too
+
 2007-06-15  Ralf Habacker  <ralf.habacker@freenet.de>
 
 	* cmake/CMakeLists.txt: use local include header first
Index: dbus/dbus-macros.h
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-macros.h,v
retrieving revision 1.9
diff -u -r1.9 dbus-macros.h
--- dbus/dbus-macros.h	21 Oct 2006 17:43:30 -0000	1.9
+++ dbus/dbus-macros.h	17 Jun 2007 09:14:52 -0000
@@ -51,9 +51,11 @@
 #endif
 
 #if  __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)
-#define DBUS_GNUC_DEPRECATED __attribute__((__deprecated__))
+#  define DBUS_DEPRECATED __attribute__ ((__deprecated__))
+#elif defined(_MSC_VER) && (_MSC_VER >= 1300)
+#  define DBUS_DEPRECATED __declspec(deprecated)
 #else
-#define DBUS_GNUC_DEPRECATED
+#  define DBUS_DEPRECATED
 #endif
 
 /* Normally docs are in .c files, but there isn't a .c file for this. */
@@ -103,9 +105,9 @@
  * A null pointer, defined appropriately for C or C++.
  */
 /**
- * @def DBUS_GNUC_DEPRECATED
+ * @def DBUS_DEPRECATED
  *
- * Tells gcc to warn about a function or type if it's used.
+ * Tells the compiler to warn about a function or type if it's used.
  * Code marked in this way should also be enclosed in
  * @code
  * #ifndef DBUS_DISABLE_DEPRECATED
Index: dbus/dbus-message.c
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-message.c,v
retrieving revision 1.186
diff -u -r1.186 dbus-message.c
--- dbus/dbus-message.c	13 Jun 2007 21:15:33 -0000	1.186
+++ dbus/dbus-message.c	17 Jun 2007 09:11:41 -0000
@@ -1256,7 +1256,7 @@
  * aside from the printf formatting.
  *
  * @todo add _DBUS_GNUC_PRINTF to this (requires moving _DBUS_GNUC_PRINTF to
- * public header, see DBUS_GNUC_DEPRECATED for an example)
+ * public header, see DBUS_DEPRECATED for an example)
  * 
  * @param reply_to the original message
  * @param error_name the error name
Index: dbus/dbus-message.h
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-message.h,v
retrieving revision 1.66
diff -u -r1.66 dbus-message.h
--- dbus/dbus-message.h	6 Apr 2007 12:13:13 -0000	1.66
+++ dbus/dbus-message.h	17 Jun 2007 09:11:52 -0000
@@ -173,7 +173,7 @@
 /* This function returns the wire protocol size of the array in bytes,
  * you do not want to know that probably
  */
-int         dbus_message_iter_get_array_len    (DBusMessageIter *iter) DBUS_GNUC_DEPRECATED;
+DBUS_DEPRECATED int         dbus_message_iter_get_array_len    (DBusMessageIter *iter);
 #endif
 void        dbus_message_iter_get_fixed_array  (DBusMessageIter *iter,
                                                 void            *value,