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
Unified · Split
| @@ -49,15 +49,22 @@ extern "C" { · 48 unmodified lines | |||
| 49 | #ifndef DEPRECATED | 49 | #ifndef DEPRECATED |
| 50 | #if defined(__GNUC__) && __GNUC__ | 50 | #if defined(__GNUC__) && __GNUC__ |
| 51 | #define DEPRECATED __attribute__ ((deprecated)) | 51 | #define DEPRECATED __attribute__ ((deprecated)) |
| 52 | #define DECLSPEC_DEPRECATED /**< \copydoc #DEPRECATED */ | ||
| 53 | #elif defined(_MSC_VER) | 52 | #elif defined(_MSC_VER) |
| 54 | #define DEPRECATED | 53 | #define DEPRECATED |
| 55 | #define DECLSPEC_DEPRECATED __declspec(deprecated) /**< \copydoc #DEPRECATED */ | ||
| 56 | #else | 54 | #else |
| 57 | #define DEPRECATED | 55 | #define DEPRECATED |
| 58 | #define DECLSPEC_DEPRECATED /**< \copydoc #DEPRECATED */ | ||
| 59 | #endif | 56 | #endif |
| 57 | #endif /* DEPRECATED */ | ||
| 58 | |||
| 59 | #ifndef DECLSPEC_DEPRECATED | ||
| 60 | #if defined(__GNUC__) && __GNUC__ | ||
| 61 | #define DECLSPEC_DEPRECATED /**< \copydoc #DEPRECATED */ | ||
| 62 | #elif defined(_MSC_VER) | ||
| 63 | #define DECLSPEC_DEPRECATED __declspec(deprecated) /**< \copydoc #DEPRECATED */ | ||
| 64 | #else | ||
| 65 | #define DECLSPEC_DEPRECATED /**< \copydoc #DEPRECATED */ | ||
| 60 | #endif | 66 | #endif |
| 67 | #endif /* DECLSPEC_DEPRECATED */ | ||
| 61 | 68 | ||
| 62 | /*!\brief Decorator indicating a function is potentially unused */ | 69 | /*!\brief Decorator indicating a function is potentially unused */ |
| 63 | #ifdef UNUSED | 70 | #ifdef UNUSED |