Merge remote-tracking branch 'origin/master' into 4.3.4

Conflicts:
	src/server/authserver/Main.cpp
	src/server/authserver/Realms/RealmList.cpp
	src/server/authserver/Realms/RealmList.h
	src/server/authserver/Server/AuthSession.cpp
	src/server/authserver/Server/AuthSocket.h
	src/server/authserver/Server/RealmAcceptor.h
	src/server/game/Accounts/AccountMgr.h
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Achievements/AchievementMgr.h
	src/server/game/Battlegrounds/ArenaTeamMgr.cpp
	src/server/game/Conditions/ConditionMgr.cpp
	src/server/game/DungeonFinding/LFGMgr.h
	src/server/game/Entities/Object/Object.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Handlers/BattleGroundHandler.cpp
	src/server/game/Movement/Spline/MoveSplineFlag.h
	src/server/game/Quests/QuestDef.cpp
	src/server/game/Quests/QuestDef.h
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSession.h
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Server/WorldSocket.h
	src/server/game/Spells/Spell.cpp
	src/server/scripts/Commands/cs_debug.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
	src/server/scripts/Spells/spell_mage.cpp
	src/server/scripts/Spells/spell_rogue.cpp
	src/server/scripts/Spells/spell_shaman.cpp
	src/server/scripts/Spells/spell_warrior.cpp
	src/server/shared/Cryptography/BigNumber.h
	src/server/worldserver/RemoteAccess/RASocket.cpp
	src/server/worldserver/worldserver.conf.dist

1 files changed, 0 insertions, 73 deletions

diff --git a/dep/acelite/ace/config-posix.h b/dep/acelite/ace/config-posix.h
deleted file mode 100644
index 09b4e0671f3..00000000000
--- a/dep/acelite/ace/config-posix.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* -*- C++ -*- */
-// $Id: config-posix.h 82517 2008-08-05 19:36:26Z shuston $
-
-#ifndef ACE_CONFIG_POSIX_H
-#define ACE_CONFIG_POSIX_H
-
-#include <unistd.h>
-
-/*  The following POSIX constants are defined after <unistd.h> is
- *  included.  They are documented in:
- * http://www.opengroup.org/onlinepubs/007904975/basedefs/unistd.h.html
- */
-#if defined(_POSIX_REALTIME_SIGNALS) && (_POSIX_REALTIME_SIGNALS-0 != -1 )
-# if !defined(ACE_HAS_POSIX_REALTIME_SIGNALS)
-#  define ACE_HAS_POSIX_REALTIME_SIGNALS
-# endif /* ACE_HAS_POSIX_REALTIME_SIGNALS */
-#endif /* _POSIX_REALTIME_SIGNALS */
-
-#if defined(_POSIX_ASYNCHRONOUS_IO) && (_POSIX_ASYNCHRONOUS_IO-0 != -1 )
-# if !defined(ACE_HAS_AIO_CALLS)
-#  define ACE_HAS_AIO_CALLS
-# endif /* ACE_HAS_AIO_CALLS */
-#endif /* _POSIX_ASYNCHRONOUS_IO */
-
-#if !defined (ACE_MT_SAFE) || (ACE_MT_SAFE != 0)
-# if defined(_POSIX_SEMAPHORES) && (_POSIX_SEMAPHORES-0 != -1 )
-#  if !defined(ACE_HAS_POSIX_SEM)
-#   define ACE_HAS_POSIX_SEM
-#  endif /* ACE_HAS_POSIX_SEM */
-#  if defined(ACE_HAS_POSIX_SEM)
-#   if !defined (ACE_HAS_POSIX_SEM_TIMEOUT) && \
-       (defined (_POSIX_TIMEOUTS) && (_POSIX_TIMEOUTS-0 != -1))
-#     define ACE_HAS_POSIX_SEM_TIMEOUT
-#   endif /* ACE_HAS_POSIX_SEM_TIMEOUT && _POSIX_TIMEOUTS */
-#  endif /* ACE_HAS_POSIX_SEM */
-# endif /* ACE_HAS_POSIX_SEM */
-#endif /* !ACE_MT_SAFE */
-
-#if defined(_POSIX_SHARED_MEMORY_OBJECTS) && (_POSIX_SHARED_MEMORY_OBJECTS-0 != -1 )
-# if !defined(ACE_HAS_SHM_OPEN)
-#  define ACE_HAS_SHM_OPEN
-# endif /* ACE_HAS_SHM_OPEN */
-#endif /* _POSIX_SHARED_MEMORY_OBJECTS */
-
-// Check if threading enabled/disable through platform_macros
-#if !defined (ACE_MT_SAFE) || (ACE_MT_SAFE != 0)
-// Allow the user to disable use of threads by setting ACE_HAS_THREADS to 0
-// before including this file. The platform config (not macros) file can
-// often detect that the compiler was invoked with or without threads support
-// and set this accordingly.
-# if defined (ACE_HAS_THREADS) && (ACE_HAS_THREADS == 0)
-#   undef ACE_HAS_THREADS
-# else
-#   if defined(_POSIX_THREADS) && (_POSIX_THREADS-0 != -1 )
-#     if !defined(ACE_HAS_THREADS)
-#       define ACE_HAS_THREADS
-#     endif /* ACE_HAS_THREADS */
-
-#     if !defined(ACE_HAS_PTHREADS)
-#       define ACE_HAS_PTHREADS
-#     endif /* ACE_HAS_PTHREADS */
-
-#   endif /* _POSIX_THREADS */
-# endif /* ACE_HAS_THREADS */
-#endif /* !ACE_MT_SAFE */
-
-#if defined(_POSIX_MESSAGE_PASSING) && (_POSIX_MESSAGE_PASSING-0 != -1 )
-# if !defined(ACE_HAS_POSIX_MESSAGE_PASSING)
-#  define ACE_HAS_POSIX_MESSAGE_PASSING
-# endif /* ACE_HAS_POSIX_MESSAGE_PASSING */
-#endif /* _POSIX_MESSAGE_PASSING */
-
-#endif /* ACE_CONFIG_POSIX_H */