diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2017-02-03 12:19:24 +0100 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2017-02-03 12:19:24 +0100 |
| commit | 8cd29a94bfe71a5cc846f4e7ff098dad44fe0953 (patch) | |
| tree | 3d8d5de9aa9c39fc2f8c65d21e38411e35ee01c0 | |
| parent | c29aa9215a2375cb949040d8606806bc2b799fd7 (diff) | |
| parent | 912c2853b6faa0893689420533cb0d562f099032 (diff) | |
| download | ATCD-8cd29a94bfe71a5cc846f4e7ff098dad44fe0953.tar.gz | |
Merge branch 'master' of git://github.com/DOCGroup/ATCD
| -rw-r--r-- | ACE/ace/config-linux.h | 3 | ||||
| -rw-r--r-- | ACE/ace/config-macosx-lion.h | 4 | ||||
| -rw-r--r-- | ACE/ace/config-macosx-snowleopard.h | 5 |
3 files changed, 0 insertions, 12 deletions
diff --git a/ACE/ace/config-linux.h b/ACE/ace/config-linux.h index a015f8939c4..4a3f8877cf8 100644 --- a/ACE/ace/config-linux.h +++ b/ACE/ace/config-linux.h @@ -146,9 +146,6 @@ // this must appear before its #include. # define ACE_HAS_STRING_CLASS # include "ace/config-g++-common.h" -# ifdef __clang__ -# undef ACE_HAS_GCC_ATOMIC_BUILTINS -# endif #elif defined (__SUNCC_PRO) || defined (__SUNPRO_CC) # include "ace/config-suncc-common.h" #elif defined (__PGI) diff --git a/ACE/ace/config-macosx-lion.h b/ACE/ace/config-macosx-lion.h index 13d450f0aae..055e083773f 100644 --- a/ACE/ace/config-macosx-lion.h +++ b/ACE/ace/config-macosx-lion.h @@ -4,10 +4,6 @@ #include "ace/config-macosx-leopard.h" #ifdef __clang__ -# ifdef ACE_HAS_GCC_ATOMIC_BUILTINS -# undef ACE_HAS_GCC_ATOMIC_BUILTINS -# endif - # define ACE_ANY_OPS_USE_NAMESPACE #endif /* __clang__ */ diff --git a/ACE/ace/config-macosx-snowleopard.h b/ACE/ace/config-macosx-snowleopard.h index cd7798279ba..553056a9a21 100644 --- a/ACE/ace/config-macosx-snowleopard.h +++ b/ACE/ace/config-macosx-snowleopard.h @@ -4,12 +4,7 @@ #include "ace/config-macosx-leopard.h" #ifdef __clang__ -#ifdef ACE_HAS_GCC_ATOMIC_BUILTINS -#undef ACE_HAS_GCC_ATOMIC_BUILTINS -#endif - #define ACE_ANY_OPS_USE_NAMESPACE - #endif #define ACE_LACKS_UCONTEXT_H |