diff options
| author | James Almer <jamrial@gmail.com> | 2017-11-11 16:50:35 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-11-11 16:50:35 -0300 |
| commit | 8882e8ad0d5c8b53cc1fce158cfdbe8284efd5bb (patch) | |
| tree | 8da78714d46727e85b870e3a0c0657f1f6626ac3 | |
| parent | 84522ad3fe77520595e97f33aca7ac0c8aee56bf (diff) | |
| parent | 93797681c2310faeeb0158f66f471965213904c6 (diff) | |
| download | ffmpeg-8882e8ad0d5c8b53cc1fce158cfdbe8284efd5bb.tar.gz | |
Merge commit '93797681c2310faeeb0158f66f471965213904c6'
* commit '93797681c2310faeeb0158f66f471965213904c6':
build: Rename stdatomic_h variable to stdatomic
Merged-by: James Almer <jamrial@gmail.com>
| -rwxr-xr-x | configure | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -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 |