diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-26 23:32:29 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-26 23:32:29 +0200 |
| commit | dcc540db6ee0f41edd09b40d9854fb1a6509eab3 (patch) | |
| tree | cd0b35444b394e09211345c8b5b5562d22c15dbd | |
| parent | 27e61a716c893a6ae67ca8f859c735bc0b0b799a (diff) | |
| parent | 342b0ba5f93b09b1d0c2597db44605300e6fcc53 (diff) | |
| download | ffmpeg-dcc540db6ee0f41edd09b40d9854fb1a6509eab3.tar.gz | |
Merge commit '342b0ba5f93b09b1d0c2597db44605300e6fcc53'
* commit '342b0ba5f93b09b1d0c2597db44605300e6fcc53':
configure: Only redirect strtoll to _strtoi64 if necessary
Conflicts:
configure
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| -rwxr-xr-x | configure | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -3660,7 +3660,7 @@ probe_cc(){ _flags='-nologo -Qdiag-error:4044,10157' # -Qvec- -Qsimd- to prevent miscompilation, -GS, fp:precise for consistency # with MSVC which enables it by default. - _cflags='-D_USE_MATH_DEFINES -Dstrtoll=_strtoi64 -Qms0 -Qvec- -Qsimd- -GS -fp:precise' + _cflags='-D_USE_MATH_DEFINES -Qms0 -Qvec- -Qsimd- -GS -fp:precise' disable stripping elif $_cc -nologo- 2>&1 | grep -q Microsoft; then _type=msvc @@ -3680,7 +3680,7 @@ probe_cc(){ _ld_lib='lib%.a' _ld_path='-libpath:' _flags='-nologo' - _cflags='-D_USE_MATH_DEFINES -D_CRT_SECURE_NO_WARNINGS -Dstrtoll=_strtoi64' + _cflags='-D_USE_MATH_DEFINES -D_CRT_SECURE_NO_WARNINGS' disable stripping elif $_cc --version 2>/dev/null | grep -q ^cparser; then _type=cparser @@ -5681,6 +5681,7 @@ elif enabled_any msvc icl; then __declspec($_restrict) void* foo(int); EOF fi + check_func strtoll || add_cflags -Dstrtoll=_strtoi64 fi for pfx in "" host_; do |