Some missing from merge.

Signed-off-by: Salja <salja2012@hotmail.de>
This commit is contained in:
Salja 2012-08-05 14:54:07 +02:00 committed by Antz
parent ec939a5bce
commit f4be15a7af
1895 changed files with 160408 additions and 53601 deletions

View file

@ -1,3 +1,5 @@
// $Id: Ping_Socket.cpp 97355 2013-09-27 22:16:09Z shuston $
#include "ace/Ping_Socket.h"
#if defined (ACE_HAS_ICMP_SUPPORT) && (ACE_HAS_ICMP_SUPPORT == 1)
@ -7,10 +9,7 @@
#include "ace/OS_NS_string.h"
#include "ace/OS_NS_sys_time.h"
#include "ace/OS_NS_sys_socket.h"
#include "ace/OS_NS_unistd.h"
#if defined (ACE_HAS_ALLOC_HOOKS)
# include "ace/Malloc_Base.h"
#endif /* ACE_HAS_ALLOC_HOOKS */
# include "ace/OS_NS_unistd.h"
#if !defined (__ACE_INLINE__)
# include "ace/Ping_Socket.inl"
@ -39,7 +38,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
#else /* #if ! defined (ACE_WIN32) */
/*
* This was a surprise to me... This stuff is not defined anywhere under MSVC.
* This was a surpise to me... This stuff is not defined anywhere under MSVC.
* These values have only been checked for NT4 and Win2K. They were taken from
* the MSDN ping.c program and modified.
*/
@ -117,7 +116,7 @@ ACE_Ping_Socket::ACE_Ping_Socket (ACE_Addr const & local,
}
// trying to increase the size of socket receive buffer - some
// protection from multiple responses e.g., when falling to the
// protection from multiple responces e.g., when falling to the
// multi-cast address
int size = 64 * 1024;
ACE_SOCK::set_option (SOL_SOCKET,