diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-20 10:29:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-20 10:29:10 +0200 |
| commit | 99dc90ea59f6f7568cfeb2c5263f632df6e4f918 (patch) | |
| tree | 262294b7a5ba8f77af7e776a26e27cd193d3565c | |
| parent | f9739a34ad53b05b8a02afdc589f241e425351f8 (diff) | |
| parent | e0d6e2fc67b854d22a01099e56ca992894324b51 (diff) | |
| download | ffmpeg-99dc90ea59f6f7568cfeb2c5263f632df6e4f918.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
configure: Remove unneeded icl inline compatibility definition
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rwxr-xr-x | configure | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -2939,7 +2939,7 @@ probe_cc(){ # -Qdiag-error to make icl error when presented with certain unknown arguments _flags='-nologo -Qdiag-error:4044,10157' # -Qvec- -Qsimd- to prevent miscompilation, -GS for consistency with msvc which enables it by default - _cflags='-D_USE_MATH_DEFINES -Dinline=__inline -FIstdlib.h -Dstrtoll=_strtoi64 -Qms0 -Qvec- -Qsimd- -GS' + _cflags='-D_USE_MATH_DEFINES -FIstdlib.h -Dstrtoll=_strtoi64 -Qms0 -Qvec- -Qsimd- -GS' if [ $pfx = hostcc ]; then append _cflags -Dsnprintf=_snprintf fi |