From ce0c4211e6f16c66477934cc42e70fa0988ca7f0 Mon Sep 17 00:00:00 2001 From: Frediano Ziglio Date: Tue, 13 Oct 2020 16:06:43 +0100 Subject: [PATCH] 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 Acked-by: Uri Lublin --- spice/enums.h | 2 +- spice/macros.h | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) 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