Merge commit '5b145290df2998a9836a93eb925289c6c8b63af0'

[ffmpeg] / libavutil / internal.h

diff --git a/libavutil/internal.h b/libavutil/internal.h
index fef5089097ec82cc39d25e56b0c105d311def2d7..c77dfa7d3c2c9d842ae7985d23fa848288791e41 100644 (file)
--- a/libavutil/internal.h
+++ b/libavutil/internal.h
@@ -63,12 +63,8 @@
 #endif
 #endif
 
-#if defined(_WIN32) && CONFIG_SHARED
-#ifdef BUILDING_avutil
-#    define av_export_avutil __declspec(dllexport)
-#else
+#if defined(_WIN32) && CONFIG_SHARED && !defined(BUILDING_avutil)
 #    define av_export_avutil __declspec(dllimport)
-#endif
 #else
 #    define av_export_avutil
 #endif
@@ -81,8 +77,8 @@
 #        define FF_DISABLE_DEPRECATION_WARNINGS __pragma(warning(push)) __pragma(warning(disable:4996))
 #        define FF_ENABLE_DEPRECATION_WARNINGS  __pragma(warning(pop))
 #    else
-#        define FF_DISABLE_DEPRECATION_WARNINGS _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")
-#        define FF_ENABLE_DEPRECATION_WARNINGS  _Pragma("GCC diagnostic warning \"-Wdeprecated-declarations\"")
+#        define FF_DISABLE_DEPRECATION_WARNINGS _Pragma("GCC diagnostic push") _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")
+#        define FF_ENABLE_DEPRECATION_WARNINGS  _Pragma("GCC diagnostic pop")
 #    endif
 #else
 #    define FF_DISABLE_DEPRECATION_WARNINGS