[FFmpeg-cvslog] Merge commit '93797681c2310faeeb0158f66f471965213904c6'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sat Nov 11 16:50:35 2017 -0300| [8882e8ad0d5c8b53cc1fce158cfdbe8284efd5bb] | committer: James Almer

Merge commit '93797681c2310faeeb0158f66f471965213904c6'

* commit '93797681c2310faeeb0158f66f471965213904c6':
  build: Rename stdatomic_h variable to stdatomic

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

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

 configure | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/configure b/configure
index 111137b9bd..ca5fe7153f 100755
--- a/configure
+++ b/configure
@@ -1929,7 +1929,6 @@ HEADERS_LIST="
     opencv2_core_core_c_h
     OpenGL_gl3_h
     poll_h
-    stdatomic_h
     sys_param_h
     sys_resource_h
     sys_select_h
@@ -5768,7 +5767,7 @@ check_header asm/types.h
 # it seems there are versions of clang in some distros that try to use the
 # gcc headers, which explodes for stdatomic
 # so we also check that atomics actually work here
-check_builtin stdatomic_h stdatomic.h "atomic_int foo, bar = ATOMIC_VAR_INIT(-1); atomic_store(&foo, 0)"
+check_builtin stdatomic stdatomic.h "atomic_int foo, bar = ATOMIC_VAR_INIT(-1); atomic_store(&foo, 0)"
 
 check_lib advapi32 "windows.h"            RegCloseKey          -ladvapi32
 check_lib ole32    "windows.h"            CoTaskMemFree        -lole32
@@ -6605,7 +6604,7 @@ for thread in $THREADS_LIST; do
     fi
 done
 
-if disabled stdatomic_h; then
+if disabled stdatomic; then
     if enabled atomics_gcc; then
         add_cppflags '-I\$(SRC_PATH)/compat/atomics/gcc'
     elif enabled atomics_win32; then


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

diff --cc configure
index 111137b9bd,51b52744c0..ca5fe7153f
--- a/configure
+++ b/configure
@@@ -1926,10 -1561,7 +1926,9 @@@ HEADERS_LIST=
      machine_ioctl_bt848_h
      machine_ioctl_meteor_h
      malloc_h
 +    opencv2_core_core_c_h
 +    OpenGL_gl3_h
      poll_h
-     stdatomic_h
      sys_param_h
      sys_resource_h
      sys_select_h
@@@ -5768,9 -4611,8 +5767,9 @@@ check_header asm/types.
  # it seems there are versions of clang in some distros that try to use the
  # gcc headers, which explodes for stdatomic
  # so we also check that atomics actually work here
- check_builtin stdatomic_h stdatomic.h "atomic_int foo, bar = ATOMIC_VAR_INIT(-1); atomic_store(&foo, 0)"
 -check_builtin stdatomic stdatomic.h "atomic_int foo; atomic_store(&foo, 0)"
++check_builtin stdatomic stdatomic.h "atomic_int foo, bar = ATOMIC_VAR_INIT(-1); atomic_store(&foo, 0)"
  
 +check_lib advapi32 "windows.h"            RegCloseKey          -ladvapi32
  check_lib ole32    "windows.h"            CoTaskMemFree        -lole32
  check_lib shell32  "windows.h shellapi.h" CommandLineToArgvW   -lshell32
  check_lib wincrypt "windows.h wincrypt.h" CryptGenRandom       -ladvapi32