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: SOCK_Dgram_Bcast.cpp 97798 2014-07-03 10:57:43Z johnnyw $
#include "ace/SOCK_Dgram_Bcast.h"
#include "ace/Log_Category.h"
@ -6,9 +8,6 @@
#include "ace/os_include/net/os_if.h"
#include "ace/OS_NS_netdb.h"
#include "ace/OS_Memory.h"
#if defined (ACE_HAS_ALLOC_HOOKS)
# include "ace/Malloc_Base.h"
#endif /* ACE_HAS_ALLOC_HOOKS */
#if !defined (__ACE_INLINE__)
#include "ace/SOCK_Dgram_Bcast.inl"
@ -28,8 +27,6 @@ ACE_Bcast_Node::ACE_Bcast_Node (ACE_INET_Addr &addr,
ACE_TRACE ("ACE_Bcast_Node::ACE_Bcast_Node");
}
ACE_ALLOC_HOOK_DEFINE(ACE_Bcast_Node)
void
ACE_SOCK_Dgram_Bcast::dump (void) const
{
@ -155,11 +152,7 @@ ACE_SOCK_Dgram_Bcast::mk_broadcast (const ACE_TCHAR *host_name)
return -1;
else
ACE_OS::memcpy ((char *) &host_addr.sin_addr.s_addr,
# ifdef ACE_HOSTENT_H_ADDR
(char *) hp->ACE_HOSTENT_H_ADDR,
# else
(char *) hp->h_addr,
# endif
hp->h_length);
}