diff options
| author | Olli Savia <ops@iki.fi> | 2005-04-15 04:58:40 +0000 |
|---|---|---|
| committer | Olli Savia <ops@iki.fi> | 2005-04-15 04:58:40 +0000 |
| commit | 8a81cdca4ac8e25d0d8ccc9a8892fdf1eab87118 (patch) | |
| tree | aa1e1f13ecee43ce0449f2cd10cf4bfc3bf90c4a | |
| parent | 80d56e11a0d5c963cbd0fce92cec18b5cd61a925 (diff) | |
| download | ATCD-8a81cdca4ac8e25d0d8ccc9a8892fdf1eab87118.tar.gz | |
ChangeLogTag: Fri Apr 15 07:57:38 2005 Olli Savia <ops@iki.fi>
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ace/Ping_Socket.cpp | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index b5d501da9cc..180842fd2a0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Apr 15 07:57:38 2005 Olli Savia <ops@iki.fi> + + * ace/Ping_Socket.cpp: + Replaced NULL with 0. + Fri Apr 15 07:39:20 2005 Olli Savia <ops@iki.fi> * ace/OS.inl: diff --git a/ace/Ping_Socket.cpp b/ace/Ping_Socket.cpp index 65495237880..a131fb41afd 100644 --- a/ace/Ping_Socket.cpp +++ b/ace/Ping_Socket.cpp @@ -292,7 +292,7 @@ ACE::Ping_Socket::send_echo_check (ACE_INET_Addr &remote_addr, -1); } - sockaddr_in *addr_connect = NULL; + sockaddr_in *addr_connect = 0; addr_connect = (sockaddr_in *) remote_addr.get_addr (); /* @@ -335,7 +335,7 @@ ACE::Ping_Socket::send_echo_check (ACE_INET_Addr &remote_addr, #if defined (ACE_WIN32) _icmp->icmp_data = GetTickCount (); #else /* #if defined (ACE_WIN32) */ - gettimeofday ((struct timeval *) &_icmp->icmp_data, NULL); + gettimeofday ((struct timeval *) &_icmp->icmp_data, 0); #endif /* #if defined (ACE_WIN32) */ int length_icmp = ICMP_MIN + datalen; // checksum ICMP header and data. |