From d034bfa9475fef67340671d46a6f21258474cc97 Mon Sep 17 00:00:00 2001 From: James Zern Date: Tue, 27 Nov 2012 14:03:36 -0800 Subject: [PATCH] avoid redefining DECLSPEC_DEPRECATED fixes, e.g.: In file included from ../vpx/internal/../vpx_decoder.h:33:0, from ../vpx/internal/vpx_codec_internal.h:46, from ../vp8/common/onyx.h:21, from ../vp8/encoder/block.h:15, from ../test/subtract_test.cc:18: ../vpx/internal/../vpx_codec.h:52:0: warning: "DECLSPEC_DEPRECATED" redefined /usr/x86_64-w64-mingw32/sys-root/mingw/include/winnt.h:164:0: note: this is the location of the previous definition Change-Id: Iddc9318451d3e4e4a78b4d706518083fffff5c61 --- vpx/vpx_codec.h | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/vpx/vpx_codec.h b/vpx/vpx_codec.h index d92e165ff..243b7a507 100644 --- a/vpx/vpx_codec.h +++ b/vpx/vpx_codec.h @@ -49,15 +49,22 @@ extern "C" { #ifndef DEPRECATED #if defined(__GNUC__) && __GNUC__ #define DEPRECATED __attribute__ ((deprecated)) -#define DECLSPEC_DEPRECATED /**< \copydoc #DEPRECATED */ #elif defined(_MSC_VER) #define DEPRECATED -#define DECLSPEC_DEPRECATED __declspec(deprecated) /**< \copydoc #DEPRECATED */ #else #define DEPRECATED +#endif +#endif /* DEPRECATED */ + +#ifndef DECLSPEC_DEPRECATED +#if defined(__GNUC__) && __GNUC__ +#define DECLSPEC_DEPRECATED /**< \copydoc #DEPRECATED */ +#elif defined(_MSC_VER) +#define DECLSPEC_DEPRECATED __declspec(deprecated) /**< \copydoc #DEPRECATED */ +#else #define DECLSPEC_DEPRECATED /**< \copydoc #DEPRECATED */ #endif -#endif +#endif /* DECLSPEC_DEPRECATED */ /*!\brief Decorator indicating a function is potentially unused */ #ifdef UNUSED