diff options
| author | Frediano Ziglio <freddy77@gmail.com> | 2020-10-13 16:06:43 +0100 |
|---|---|---|
| committer | Frediano Ziglio <freddy77@gmail.com> | 2020-11-04 12:14:48 +0000 |
| commit | ce0c4211e6f16c66477934cc42e70fa0988ca7f0 (patch) | |
| tree | d5a952940a78fc987a12bcee0f55e3ad52fcab7a | |
| parent | 3c4309a5173adbb445d5c47ff6b848c9775f02ab (diff) | |
protocol: Fix enumeration deprecation for Visual Studio
Deprecation on enumeration items is not supported by Microsoft
compiler.
Define and use SPICE_GNUC_DEPRECATED_ENUMERATOR.
Signed-off-by: Frediano Ziglio <freddy77@gmail.com>
Acked-by: Uri Lublin <uril@redhat.com>
| -rw-r--r-- | spice/enums.h | 2 | ||||
| -rw-r--r-- | spice/macros.h | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/spice/enums.h b/spice/enums.h index 5c9a54c..0199589 100644 --- a/spice/enums.h +++ b/spice/enums.h @@ -377,7 +377,7 @@ typedef enum SpiceCursorFlags { typedef enum SpiceAudioDataMode { SPICE_AUDIO_DATA_MODE_INVALID, SPICE_AUDIO_DATA_MODE_RAW, - SPICE_AUDIO_DATA_MODE_CELT_0_5_1 SPICE_GNUC_DEPRECATED, + SPICE_AUDIO_DATA_MODE_CELT_0_5_1 SPICE_GNUC_DEPRECATED_ENUMERATOR, SPICE_AUDIO_DATA_MODE_OPUS, SPICE_AUDIO_DATA_MODE_ENUM_END diff --git a/spice/macros.h b/spice/macros.h index a23e866..dd6b189 100644 --- a/spice/macros.h +++ b/spice/macros.h @@ -72,6 +72,14 @@ #define SPICE_GNUC_DEPRECATED #endif +#if ((defined(__GNUC__) && (__GNUC__ > 6 || (__GNUC__ == 6 && __GNUC_MINOR__ >= 1))) || \ + (defined(__clang_major__) && (__clang_major__ > 3 || \ + (__clang_major__ == 3 && __clang_minor__ >= 0)))) +#define SPICE_GNUC_DEPRECATED_ENUMERATOR SPICE_GNUC_DEPRECATED +#else +#define SPICE_GNUC_DEPRECATED_ENUMERATOR +#endif + #if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3) # define SPICE_GNUC_MAY_ALIAS __attribute__((may_alias)) #else |