diff options
| author | silinoron <none@none> | 2010-08-15 13:21:26 -0700 |
|---|---|---|
| committer | silinoron <none@none> | 2010-08-15 13:21:26 -0700 |
| commit | 05e6147621b53a6d90b57469660c2c656f83196d (patch) | |
| tree | 3bbecb6641edf2e47501a854e6c667421da44b23 /externals/ace/config-macosx-snowleopard.h | |
| parent | e1fe290b21dadd85397eb4e415df6b2dc66aa972 (diff) | |
| parent | 4d5296299b7a72c37cda56bfa885c82167066c3c (diff) | |
merge
--HG--
branch : trunk
Diffstat (limited to 'externals/ace/config-macosx-snowleopard.h')
| -rw-r--r-- | externals/ace/config-macosx-snowleopard.h | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/externals/ace/config-macosx-snowleopard.h b/externals/ace/config-macosx-snowleopard.h index 09e9458d6b9..f9b3522a5aa 100644 --- a/externals/ace/config-macosx-snowleopard.h +++ b/externals/ace/config-macosx-snowleopard.h @@ -1,17 +1,10 @@ -// $Id: config-macosx-snowleopard.h 91093 2010-07-15 09:12:20Z wotte $ +// $Id: config-macosx-snowleopard.h 87236 2009-10-27 08:21:42Z wotte $ #ifndef ACE_CONFIG_MACOSX_SNOWLEOPARD_H #define ACE_CONFIG_MACOSX_SNOWLEOPARD_H - #include "ace/config-macosx-leopard.h" -#ifdef __clang__ -#ifdef ACE_HAS_GCC_ATOMIC_BUILTINS -#undef ACE_HAS_GCC_ATOMIC_BUILTINS -#endif -#endif - // This header has been deprecated in Snow Leopard. #define ACE_LACKS_UCONTEXT_H -#endif // ACE_CONFIG_MACOSX_SNOWLEOPARD_H +#endif ACE_CONFIG_MACOSX_SNOWLEOPARD_H |