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-macros.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-macros.h')
| -rw-r--r-- | dep/acelite/ace/config-macros.h | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/dep/acelite/ace/config-macros.h b/dep/acelite/ace/config-macros.h index d81156e9480..32e58947e9a 100644 --- a/dep/acelite/ace/config-macros.h +++ b/dep/acelite/ace/config-macros.h @@ -4,7 +4,7 @@ /** * @file config-macros.h * - * $Id: config-macros.h 91685 2010-09-09 09:35:14Z johnnyw $ + * $Id: config-macros.h 94386 2011-08-10 12:42:53Z johnnyw $ * * @author (Originally in OS.h)Doug Schmidt <schmidt@cs.wustl.edu> * @author Jesper S. M|ller<stophph@diku.dk> @@ -69,9 +69,6 @@ # if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) # define ACE_MT(X) X -# if !defined (_REENTRANT) -# define _REENTRANT -# endif /* _REENTRANT */ # else # define ACE_MT(X) # endif /* ACE_MT_SAFE */ @@ -82,6 +79,7 @@ # if defined (ACE_HAS_VALGRIND) # define ACE_INITIALIZE_MEMORY_BEFORE_USE +# define ACE_LACKS_DLCLOSE # endif /* ACE_HAS_VALGRIND */ // ========================================================================= @@ -499,8 +497,16 @@ extern "C" u_long CLS##_Export _get_dll_unload_policy (void) \ #define ACE_HAS_TEMPLATE_TYPEDEFS #endif +#ifndef ACE_GCC_FORMAT_ATTRIBUTE +# define ACE_GCC_FORMAT_ATTRIBUTE(TYPE, STR_INDEX, FIRST_INDEX) +#endif + #ifndef ACE_DEPRECATED # define ACE_DEPRECATED #endif +#ifndef ACE_HAS_REACTOR_NOTIFICATION_QUEUE +# define ACE_HAS_REACTOR_NOTIFICATION_QUEUE +#endif + #endif /* ACE_CONFIG_MACROS_H */ |