shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "avoid redefining DECLSPEC_DEPRECATED"

--- a/vpx/vpx_codec.h

+++ b/vpx/vpx_codec.h

@@ -49,15 +49,22 @@

 #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