diff options
| author | Nay <dnpd.dd@gmail.com> | 2012-09-17 23:49:13 +0100 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2012-09-17 23:49:13 +0100 |
| commit | 6568b0624dcd03243c70f9aa905b88422cb1e4c2 (patch) | |
| tree | 48ec6babfbfb2f9d255df568b659db9541d11054 /dep/acelite/ace/config-macosx-leopard.h | |
| parent | e3add09fb7f8f3c425f6cb0e7611e4e2381bf88d (diff) | |
| parent | 2e21fa6b925c4572d620248f1b149a5d652836b2 (diff) | |
Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/Entities/Object/Updates/UpdateFields.h
src/server/game/Entities/Unit/Unit.cpp
src/server/scripts/Spells/spell_druid.cpp
Diffstat (limited to 'dep/acelite/ace/config-macosx-leopard.h')
| -rw-r--r-- | dep/acelite/ace/config-macosx-leopard.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dep/acelite/ace/config-macosx-leopard.h b/dep/acelite/ace/config-macosx-leopard.h index 5fb28c338f3..42229ebd2d4 100644 --- a/dep/acelite/ace/config-macosx-leopard.h +++ b/dep/acelite/ace/config-macosx-leopard.h @@ -1,5 +1,5 @@ /* -*- C++ -*- */ -// $Id: config-macosx-leopard.h 91688 2010-09-09 11:21:50Z johnnyw $ +// $Id: config-macosx-leopard.h 96085 2012-08-21 02:48:37Z mesnier_p $ // This configuration file is designed to work with the MacOS X operating system. @@ -176,7 +176,6 @@ # define ACE_HAS_THREADS // And they're even POSIX pthreads # define ACE_HAS_PTHREADS -# define ACE_HAS_PTHREADS_STD # define ACE_HAS_PTHREAD_SCHEDPARAM # define ACE_HAS_THREAD_SPECIFIC_STORAGE #endif /* ACE_MT_SAFE == 1 */ @@ -205,6 +204,7 @@ #define ACE_HAS_VOID_UNSETENV #endif +#define ACE_LACKS_CONDATTR_SETCLOCK // dlcompat package (not part of base Darwin) is needed for dlopen(). // You may download directly from sourceforge and install or use fink |