diff options
| author | Ralf Habacker <ralf.habacker@freenet.de> | 2007-06-17 16:43:39 +0000 |
|---|---|---|
| committer | Ralf Habacker <ralf.habacker@freenet.de> | 2007-06-17 16:43:39 +0000 |
| commit | fb93e1faa875d6b1ca48b0e792a9b79aa7cbc517 (patch) | |
| tree | a75f3e860b4739907b85c8972abb1feffd05fdcf /dbus/dbus-macros.h | |
| parent | 938cc4c7b3a06ded1d76142000ee55356f4f7776 (diff) | |
* dbus/dbus-macros.h, dbus/dbus-message.c, dbus/dbus-message.h: renamed DBUS_GNUC_DEPRECATED to DBUS_DEPRECATED and extended to msvc compiler
Diffstat (limited to 'dbus/dbus-macros.h')
| -rw-r--r-- | dbus/dbus-macros.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/dbus/dbus-macros.h b/dbus/dbus-macros.h index 5d9524e1..724cc18c 100644 --- a/dbus/dbus-macros.h +++ b/dbus/dbus-macros.h @@ -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 |