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-cygwin32.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-cygwin32.h')
| -rw-r--r-- | dep/acelite/ace/config-cygwin32.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/dep/acelite/ace/config-cygwin32.h b/dep/acelite/ace/config-cygwin32.h index 35c517c3ca6..4fc15437100 100644 --- a/dep/acelite/ace/config-cygwin32.h +++ b/dep/acelite/ace/config-cygwin32.h @@ -1,5 +1,5 @@ /* -*- C++ -*- */ -// $Id: config-cygwin32.h 87169 2009-10-19 20:26:55Z olli $ +// $Id: config-cygwin32.h 93530 2011-03-11 12:12:40Z olli $ // The following configuration file is designed to work for CygWin // platforms using GNU C++. @@ -64,7 +64,6 @@ #define ACE_HAS_VOIDPTR_SOCKOPT 1 #define ACE_HAS_UALARM 1 #define ACE_HAS_STRNLEN 1 -#define ACE_HAS_POSIX_GETPWNAM_R 1 #define ACE_HAS_POSIX_NONBLOCK 1 #define ACE_HAS_POSIX_TIME #define ACE_HAS_CLOCK_GETTIME 1 @@ -73,11 +72,9 @@ #define ACE_DEFAULT_BASE_ADDR ((char *) 0x8000000) #define ACE_HAS_NONCONST_SELECT_TIMEVAL #define ACE_HAS_SVR4_DYNAMIC_LINKING -//#define ACE_HAS_SYSV_IPC #define ACE_HAS_VOIDPTR_MMAP #define ACE_HAS_CPLUSPLUS_HEADERS #define ACE_HAS_POLL -#define ACE_HAS_POSITION_INDEPENDENT_POINTERS 1 #define ACE_HAS_SOCKADDR_MSG_NAME 1 #define ACE_LACKS_PRI_T 1 #define ACE_HAS_3_PARAM_READDIR_R |