| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-20 13:50:59 (GMT) |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-20 13:51:27 (GMT) |
| commit | e1f74ad1f0102648e2db8e4fda788f47d38a94ad (patch) | |
| tree | a415202d6f9e2edc597ddb433309cf71ddc1f0f6 | |
| parent | dda7bd13b3498243a199c77aac4fca602147828f (diff) | |
| parent | 09f2581dc5edb3642858d69d9a70b67e249167e9 (diff) | |
| download | ffmpeg-e1f74ad1f0102648e2db8e4fda788f47d38a94ad.zip ffmpeg-e1f74ad1f0102648e2db8e4fda788f47d38a94ad.tar.gz ffmpeg-e1f74ad1f0102648e2db8e4fda788f47d38a94ad.tar.bz2 | |
Merge commit '09f2581dc5edb3642858d69d9a70b67e249167e9'
* commit '09f2581dc5edb3642858d69d9a70b67e249167e9':
msvc/icl: Use __declspec(deprecated)
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rwxr-xr-x | configure | 5 | ||||
| -rw-r--r-- | libavutil/internal.h | 12 |
2 files changed, 13 insertions, 4 deletions
@@ -2754,7 +2754,7 @@ msvc_flags(){ -wd4146 -wd4057 -wd4204 -wd4706 -wd4305 \ -wd4152 -wd4324 -we4013 -wd4100 -wd4214 \ -wd4554 \ - -wd4996 -wd4273 ;; + -wd4273 ;; esac done } @@ -2979,7 +2979,7 @@ probe_cc(){ _ld_lib='lib%.a' _ld_path='-libpath:' _flags='-nologo' - _cflags='-D_USE_MATH_DEFINES -Dinline=__inline -FIstdlib.h -Dstrtoll=_strtoi64' + _cflags='-D_USE_MATH_DEFINES -D_CRT_SECURE_NO_WARNINGS -Dinline=__inline -FIstdlib.h -Dstrtoll=_strtoi64' if [ $pfx = hostcc ]; then append _cflags -Dsnprintf=_snprintf fi @@ -4533,6 +4533,7 @@ elif enabled_any msvc icl; then enabled x86_32 && disable aligned_stack enabled_all x86_32 debug && add_cflags -Oy- enabled debug && add_ldflags -debug + enable pragma_deprecated if enabled icl; then # basically -fstrict-aliasing that does not work (correctly) on icl 13.x check_cpp_condition "windows.h" "__ICL < 1300" && add_cflags -Qansi-alias diff --git a/libavutil/internal.h b/libavutil/internal.h index 9df2dd1..6bc426e 100644 --- a/libavutil/internal.h +++ b/libavutil/internal.h @@ -63,8 +63,16 @@ #endif #if HAVE_PRAGMA_DEPRECATED -# define FF_DISABLE_DEPRECATION_WARNINGS _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"") -# define FF_ENABLE_DEPRECATION_WARNINGS _Pragma("GCC diagnostic warning \"-Wdeprecated-declarations\"") +# if defined(__ICL) +# define FF_DISABLE_DEPRECATION_WARNINGS __pragma(warning(push)) __pragma(warning(disable:1478)) +# define FF_ENABLE_DEPRECATION_WARNINGS __pragma(warning(pop)) +# elif defined(_MSC_VER) +# 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\"") +# endif #else # define FF_DISABLE_DEPRECATION_WARNINGS # define FF_ENABLE_DEPRECATION_WARNINGS |