Commit ca9ceddd authored by Francois Gouget's avatar Francois Gouget Committed by Alexandre Julliard

netstat: Fix compilation on systems that don't support nameless unions.

parent f963f939
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#define NONAMELESSUNION
#include "netstat.h" #include "netstat.h"
#include <winsock2.h> #include <winsock2.h>
#include <iphlpapi.h> #include <iphlpapi.h>
...@@ -178,9 +179,9 @@ static void NETSTAT_tcp_table(void) ...@@ -178,9 +179,9 @@ static void NETSTAT_tcp_table(void)
for (i = 0; i < table->dwNumEntries; i++) for (i = 0; i < table->dwNumEntries; i++)
{ {
if ((table->table[i].dwState == MIB_TCP_STATE_CLOSE_WAIT) || if ((table->table[i].u.dwState == MIB_TCP_STATE_CLOSE_WAIT) ||
(table->table[i].dwState == MIB_TCP_STATE_ESTAB) || (table->table[i].u.dwState == MIB_TCP_STATE_ESTAB) ||
(table->table[i].dwState == MIB_TCP_STATE_TIME_WAIT)) (table->table[i].u.dwState == MIB_TCP_STATE_TIME_WAIT))
{ {
NETSTAT_host_name(table->table[i].dwLocalAddr, HostIp); NETSTAT_host_name(table->table[i].dwLocalAddr, HostIp);
NETSTAT_port_name(table->table[i].dwLocalPort, HostPort); NETSTAT_port_name(table->table[i].dwLocalPort, HostPort);
...@@ -189,7 +190,7 @@ static void NETSTAT_tcp_table(void) ...@@ -189,7 +190,7 @@ static void NETSTAT_tcp_table(void)
sprintfW(Host, fmtcolon, HostIp, HostPort); sprintfW(Host, fmtcolon, HostIp, HostPort);
sprintfW(Remote, fmtcolon, RemoteIp, RemotePort); sprintfW(Remote, fmtcolon, RemoteIp, RemotePort);
NETSTAT_wprintf(fmttcpout, tcpW, Host, Remote, NETSTAT_load_message(table->table[i].dwState)); NETSTAT_wprintf(fmttcpout, tcpW, Host, Remote, NETSTAT_load_message(table->table[i].u.dwState));
} }
} }
HeapFree(GetProcessHeap(), 0, table); HeapFree(GetProcessHeap(), 0, table);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment