Merge commit '79fb0692992c74214c6cf8e81350fc93eeffc5ec'

* commit '79fb0692992c74214c6cf8e81350fc93eeffc5ec':
  configure: Move defines for controlling MSVCRT headers to the CRT detection section

Merged-by: Clément Bœsch <cboesch@gopro.com>

diff --cc configure
index a91ab075bfe561e3f279e570ed3a63d6020c949d,a41c1e8f8e8cb50905fdcbce73d53a2d92cd2d8b..93139ba5b79aa4d33e73e2071571951b19106322
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -4090,30 -3259,9 +4090,29 @@@ probe_cc()
          _ld_path='-libpath:'
          # -Qdiag-error to make icl error when seeing certain unknown arguments
          _flags='-nologo -Qdiag-error:4044,10157'
 -        # -Qvec- -Qsimd- to prevent miscompilation, -GS for consistency
 +        # -Qvec- -Qsimd- to prevent miscompilation, -GS, fp:precise for consistency
          # with MSVC which enables it by default.
-         _cflags='-D_USE_MATH_DEFINES -Qms0 -Qvec- -Qsimd- -GS -fp:precise'
 -        _cflags='-Qms0 -Qvec- -Qsimd- -GS'
++        _cflags='-Qms0 -Qvec- -Qsimd- -GS -fp:precise'
 +        disable stripping
 +    elif $_cc -nologo- 2>&1 | grep -q Microsoft; then
 +        _type=msvc
 +        _ident=$($_cc 2>&1 | head -n1)
 +        _DEPCMD='$(DEP$(1)) $(DEP$(1)FLAGS) $($(1)DEP_FLAGS) $< 2>&1 | awk '\''/including/ { sub(/^.*file: */, ""); gsub(/\\/, "/"); if (!match($$0, / /)) print "$@:", $$0 }'\'' > $(@:.o=.d)'
 +        _DEPFLAGS='$(CPPFLAGS) $(CFLAGS) -showIncludes -Zs'
 +        _cflags_speed="-O2"
 +        _cflags_size="-O1"
 +        if $_cc -nologo- 2>&1 | grep -q Linker; then
 +            _ld_o='-out:$@'
 +        else
 +            _ld_o='-Fe$@'
 +        fi
 +        _cc_o='-Fo$@'
 +        _cc_e='-P -Fi$@'
 +        _flags_filter=msvc_flags
 +        _ld_lib='lib%.a'
 +        _ld_path='-libpath:'
 +        _flags='-nologo'
-         _cflags='-D_USE_MATH_DEFINES -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS'
 +        disable stripping
      elif $_cc --version 2>/dev/null | grep -q ^cparser; then
          _type=cparser
          _ident=$($_cc --version | head -n1)