Merge commit '93797681c2310faeeb0158f66f471965213904c6'
authorJames Almer <jamrial@gmail.com>
Sat, 11 Nov 2017 19:50:35 +0000 (16:50 -0300)
committerJames Almer <jamrial@gmail.com>
Sat, 11 Nov 2017 19:50:35 +0000 (16:50 -0300)
* commit '93797681c2310faeeb0158f66f471965213904c6':
  build: Rename stdatomic_h variable to stdatomic

Merged-by: James Almer <jamrial@gmail.com>
1  2 
configure

diff --cc 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