ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #282 from Tilka/atomic_clang_fix 

Atomic: support clang 3.4+
This commit is contained in:
comex 2014-04-18 20:31:33 -04:00
parent 68d0a32ef9 b3c7395a23
commit 5a5e63bdd4
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Core/Common/Atomic_GCC.h
View File

@ -45,7 +45,8 @@ inline void AtomicOr(volatile u32& target, u32 value) {
__sync_or_and_fetch(&target, value); __sync_or_and_fetch(&target, value);
} }
#ifdef __clang__ // Support clang versions older than 3.4.
#if __clang__ && !__has_feature(cxx_atomic)
template <typename T> template <typename T>
_Atomic(T)* ToC11Atomic(volatile T* loc) _Atomic(T)* ToC11Atomic(volatile T* loc)
{ {

4
Source/Core/Common/Common.h
View File

@ -11,6 +11,10 @@
#include <cstdlib> #include <cstdlib>
#include <cstring> #include <cstring>
#ifndef __has_feature
#define __has_feature(x) 0
#endif
// SVN version number // SVN version number
extern const char *scm_desc_str; extern const char *scm_desc_str;
extern const char *scm_branch_str; extern const char *scm_branch_str;