diff options
| author | Nay <dnpd.dd@gmail.com> | 2012-09-17 23:50:08 +0100 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2012-09-17 23:50:08 +0100 |
| commit | 23961d0dce22e234e62f116469f04bb62d8986a7 (patch) | |
| tree | ab271f0a3fffa8f21f9ac7fd669f457beb9eb356 /dep/acelite/ace/ICMP_Socket.cpp | |
| parent | 2431895a54b38e4c0e6444c740ff2298e31e26e2 (diff) | |
| parent | 2e21fa6b925c4572d620248f1b149a5d652836b2 (diff) | |
Merge remote-tracking branch 'origin/master' into mmaps
Diffstat (limited to 'dep/acelite/ace/ICMP_Socket.cpp')
| -rw-r--r-- | dep/acelite/ace/ICMP_Socket.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/dep/acelite/ace/ICMP_Socket.cpp b/dep/acelite/ace/ICMP_Socket.cpp index 5247dc4b83a..04ac2611d75 100644 --- a/dep/acelite/ace/ICMP_Socket.cpp +++ b/dep/acelite/ace/ICMP_Socket.cpp @@ -1,4 +1,4 @@ -// $Id: ICMP_Socket.cpp 91286 2010-08-05 09:04:31Z johnnyw $ +// $Id: ICMP_Socket.cpp 93560 2011-03-16 13:54:49Z johnnyw $ #include "ace/ICMP_Socket.h" @@ -85,9 +85,9 @@ ACE_ICMP_Socket::open (ACE_Addr const & local, // Check if icmp protocol is supported on this host int proto_number = -1; - protoent *proto; + protoent *proto = 0; - if (! (proto = getprotobyname ("icmp"))) + if (! (proto = ACE_OS::getprotobyname ("icmp"))) { ACE_ERROR_RETURN ((LM_ERROR, |