virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

Merge commit '93797681c2310faeeb0158f66f471965213904c6'

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

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer
2017-11-11 16:50:35 -03:00
parent 84522ad3fe 93797681c2
commit 8882e8ad0d
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
configure vendored
View File

@@ -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