summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-08-13 23:34:14 +0200
committerwm4 <wm4@nowhere>2015-08-13 23:34:14 +0200
commit70c990cda5dc3e8d816223ceb2338cda1da4882a (patch)
treedf10db0e1ff79381b5cd4fab95bf0e602045bc0a
parentbaeead7181c30b0ccf847b1f9c4f599099407784 (diff)
downloadmpv-70c990cda5dc3e8d816223ceb2338cda1da4882a.tar.bz2
mpv-70c990cda5dc3e8d816223ceb2338cda1da4882a.tar.xz
atomics: cleanup HAVE_ATOMICS define
The waf build system generates this already. No point in redoing it in the header file. The legacy build system (which we really should drop) didn't; fix it.
-rwxr-xr-xTOOLS/old-configure3
-rw-r--r--osdep/atomics.h5
2 files changed, 3 insertions, 5 deletions
diff --git a/TOOLS/old-configure b/TOOLS/old-configure
index b93d35d2e2..ada5ca7356 100755
--- a/TOOLS/old-configure
+++ b/TOOLS/old-configure
@@ -514,9 +514,12 @@ check_statement_libs "compiler support for __sync built-ins" $_sync SYNC_BUILTIN
stdint.h 'int64_t test = 0; test = __sync_add_and_fetch(&test, 1)'
_sync=$(defretval)
+_any_atomic=yes
if test "$_atomic" = no && test "$_sync" = no && test "$_stdatomic" = no ; then
echo "your compiler must support either stdatomic.h, or __atomic, or __sync built-ins."
+ _any_atomic=no
fi
+define_yes_no $_any_atomic HAVE_ATOMICS
check_compile "iconv" $_iconv ICONV waftools/fragments/iconv.c " " "-liconv" "-liconv $_ld_dl"
_iconv=$(defretval)
diff --git a/osdep/atomics.h b/osdep/atomics.h
index e0bef8a879..1cac2d5700 100644
--- a/osdep/atomics.h
+++ b/osdep/atomics.h
@@ -22,8 +22,6 @@
#include <inttypes.h>
#include "config.h"
-#define HAVE_ATOMICS 1
-
#if HAVE_STDATOMIC
#include <stdatomic.h>
#else
@@ -97,9 +95,6 @@ typedef struct { volatile unsigned long long v, t; } atomic_ullong;
#define atomic_compare_exchange_strong(p, old, new) \
((p)->v == *(old) ? ((p)->v = (new), 1) : (*(old) = (p)->v, 0))
-#undef HAVE_ATOMICS
-#define HAVE_ATOMICS 0
-
#endif /* no atomics */
#endif /* else HAVE_STDATOMIC */