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.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.h')
| -rw-r--r-- | dep/acelite/ace/config-macosx.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/dep/acelite/ace/config-macosx.h b/dep/acelite/ace/config-macosx.h index 12b69de3b72..e39e27e0e73 100644 --- a/dep/acelite/ace/config-macosx.h +++ b/dep/acelite/ace/config-macosx.h @@ -1,5 +1,5 @@ /* -*- C++ -*- */ -// $Id: config-macosx.h 91693 2010-09-09 12:57:54Z johnnyw $ +// $Id: config-macosx.h 93359 2011-02-11 11:33:12Z mcorino $ // This configuration file is designed to work with the MacOS X operating system, version 10.2 (Jaguar). @@ -51,6 +51,8 @@ #define ACE_LACKS_GETPGID #define ACE_LACKS_RWLOCK_T +#define ACE_HAS_SIOCGIFCONF + // Optimize ACE_Handle_Set for select(). #define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT |