[FFmpeg-cvslog] Merge commit '38434a9ff5b9a1a048f32c1c7e2a9519cf12f8ba'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sun Feb 11 23:11:06 2018 -0300| [c1c720d5279aa2e8e0518e2900f5f2b267ee974a] | committer: James Almer

Merge commit '38434a9ff5b9a1a048f32c1c7e2a9519cf12f8ba'

* commit '38434a9ff5b9a1a048f32c1c7e2a9519cf12f8ba':
  configure: Simplify restrict keyword handling

Merged-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c1c720d5279aa2e8e0518e2900f5f2b267ee974a
---

 configure | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/configure b/configure
index 1f7978049e..760aae59f0 100755
--- a/configure
+++ b/configure
@@ -5307,9 +5307,8 @@ extern_prefix=${sym%%ff_extern*}
 
 ! disabled inline_asm && check_inline_asm inline_asm '"" ::'
 
-_restrict=
-for restrict_keyword in restrict __restrict__ __restrict; do
-    check_cc <<EOF && _restrict=$restrict_keyword && break
+for restrict_keyword in restrict __restrict__ __restrict ""; do
+    check_cc <<EOF && break
 void foo(char * $restrict_keyword p);
 EOF
 done
@@ -6495,9 +6494,9 @@ elif enabled_any msvc icl; then
     # MSVC 2013 and newer can handle it fine.
     # If this declspec fails, force including stdlib.h before the restrict redefinition
     # happens in config.h.
-    if [ $_restrict != restrict ]; then
+    if [ $restrict_keyword != restrict ]; then
         check_cc <<EOF || add_cflags -FIstdlib.h
-__declspec($_restrict) void* foo(int);
+__declspec($restrict_keyword) void *foo(int);
 EOF
     fi
     # the new SSA optimzer in VS2015 U3 is mis-optimizing some parts of the code
@@ -6972,7 +6971,7 @@ cat > $TMPH <<EOF
 #define FFMPEG_DATADIR "$(eval c_escape $datadir)"
 #define AVCONV_DATADIR "$(eval c_escape $datadir)"
 #define CC_IDENT "$(c_escape ${cc_ident:-Unknown compiler})"
-#define av_restrict $_restrict
+#define av_restrict $restrict_keyword
 #define EXTERN_PREFIX "${extern_prefix}"
 #define EXTERN_ASM ${extern_prefix}
 #define BUILDSUF "$build_suffix"


======================================================================

diff --cc configure
index 1f7978049e,b4c6320f7a..760aae59f0
--- a/configure
+++ b/configure
@@@ -6495,18 -4973,11 +6494,18 @@@ elif enabled_any msvc icl; the
      # MSVC 2013 and newer can handle it fine.
      # If this declspec fails, force including stdlib.h before the restrict redefinition
      # happens in config.h.
-     if [ $_restrict != restrict ]; then
+     if [ $restrict_keyword != restrict ]; then
          check_cc <<EOF || add_cflags -FIstdlib.h
- __declspec($_restrict) void* foo(int);
+ __declspec($restrict_keyword) void *foo(int);
  EOF
      fi
 +    # the new SSA optimzer in VS2015 U3 is mis-optimizing some parts of the code
 +    # Issue has been fixed in MSVC v19.00.24218.
 +    check_cpp_condition windows.h "_MSC_FULL_VER >= 190024218" ||
 +        check_cflags -d2SSAOptimizer-
 +    # enable utf-8 source processing on VS2015 U2 and newer
 +    check_cpp_condition windows.h "_MSC_FULL_VER >= 190023918" &&
 +        add_cflags -utf-8
  fi
  
  for pfx in "" host_; do
@@@ -6964,25 -5316,19 +6963,25 @@@ don
  
  cat > $TMPH <<EOF
  /* Automatically generated by configure - do not modify! */
 -#ifndef LIBAV_CONFIG_H
 -#define LIBAV_CONFIG_H
 -#define LIBAV_CONFIGURATION "$(c_escape $LIBAV_CONFIGURATION)"
 -#define LIBAV_LICENSE "$(c_escape $license)"
 +#ifndef FFMPEG_CONFIG_H
 +#define FFMPEG_CONFIG_H
 +#define FFMPEG_CONFIGURATION "$(c_escape $FFMPEG_CONFIGURATION)"
 +#define FFMPEG_LICENSE "$(c_escape $license)"
 +#define CONFIG_THIS_YEAR 2018
 +#define FFMPEG_DATADIR "$(eval c_escape $datadir)"
  #define AVCONV_DATADIR "$(eval c_escape $datadir)"
  #define CC_IDENT "$(c_escape ${cc_ident:-Unknown compiler})"
- #define av_restrict $_restrict
++#define av_restrict $restrict_keyword
  #define EXTERN_PREFIX "${extern_prefix}"
  #define EXTERN_ASM ${extern_prefix}
 +#define BUILDSUF "$build_suffix"
  #define SLIBSUF "$SLIBSUF"
 +#define HAVE_MMX2 HAVE_MMXEXT
 +#define SWS_MAX_FILTER_SIZE $sws_max_filter_size
  EOF
  
 -test $restrict_keyword != restrict &&
 -    echo "#define restrict $restrict_keyword" >> $TMPH
 +test -n "$assert_level" &&
 +    echo "#define ASSERT_LEVEL $assert_level" >>$TMPH
  
  test -n "$malloc_prefix" &&
      echo "#define MALLOC_PREFIX $malloc_prefix" >>$TMPH