generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avoid redefining DECLSPEC_DEPRECATED

Browse Source 
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
This commit is contained in:
James Zern
2012-11-27 14:03:36 -08:00
parent 464b1df6d4
commit d034bfa947
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
vpx/vpx_codec.h
View File

@@ -49,15 +49,22 @@ extern "C" {
#ifndef DEPRECATED #ifndef DEPRECATED
#if defined(__GNUC__) && __GNUC__ #if defined(__GNUC__) && __GNUC__
#define DEPRECATED __attribute__ ((deprecated)) #define DEPRECATED __attribute__ ((deprecated))
#define DECLSPEC_DEPRECATED /**< \copydoc #DEPRECATED */
#elif defined(_MSC_VER) #elif defined(_MSC_VER)
#define DEPRECATED #define DEPRECATED
#define DECLSPEC_DEPRECATED __declspec(deprecated) /**< \copydoc #DEPRECATED */
#else #else
#define DEPRECATED #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 */ #define DECLSPEC_DEPRECATED /**< \copydoc #DEPRECATED */
#endif #endif
#endif #endif /* DECLSPEC_DEPRECATED */
/*!\brief Decorator indicating a function is potentially unused */ /*!\brief Decorator indicating a function is potentially unused */
#ifdef UNUSED #ifdef UNUSED