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-openvms.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-openvms.h')
| -rw-r--r-- | dep/acelite/ace/config-openvms.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/dep/acelite/ace/config-openvms.h b/dep/acelite/ace/config-openvms.h index 33e2ff52d7a..91762386fc0 100644 --- a/dep/acelite/ace/config-openvms.h +++ b/dep/acelite/ace/config-openvms.h @@ -1,5 +1,5 @@ /* -*- C++ -*- */ -// $Id: config-openvms.h 91685 2010-09-09 09:35:14Z johnnyw $ +// $Id: config-openvms.h 94294 2011-07-01 09:32:25Z johnnyw $ // The following configuration file is designed to work for OpenVMS 7.3-2 @@ -87,9 +87,6 @@ #define ACE_LACKS_SYMLINKS 1 -#define ACE_LACKS_PWD_REENTRANT_FUNCTIONS 1 -#define ACE_LACKS_RAND_REENTRANT_FUNCTIONS 1 - #define ACE_HAS_P_READ_WRITE #define ACE_HAS_CHARPTR_DL 1 #define ACE_HAS_CLOCK_GETTIME 1 @@ -189,4 +186,7 @@ #define ACE_LACKS_SETENV #define ACE_LACKS_UNSETENV +#define ACE_HAS_SOCK_BUF_SIZE_MAX +#define ACE_HAS_SOCK_BUF_SIZE_MAX_VALUE 65535 + #endif |