diff options
| author | Andrey Nazarov <skuller@skuller.net> | 2010-08-02 15:07:41 +0000 |
|---|---|---|
| committer | Andrey Nazarov <skuller@skuller.net> | 2010-08-02 15:07:41 +0000 |
| commit | 9bcc513cd43c78dee3c32446f353aaa0668c2180 (patch) | |
| tree | 9617fbee93f86f629880ac300c8c1d283e7b3f36 /source/net_common.c | |
| parent | 5c73f165141b30d93309d25e1324bc0170eb4da5 (diff) | |
Made client and server buildable with mingw32 again.
Use uint64_t type for network counters.
Diffstat (limited to 'source/net_common.c')
| -rw-r--r-- | source/net_common.c | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/source/net_common.c b/source/net_common.c index 81561fd..b569f8f 100644 --- a/source/net_common.c +++ b/source/net_common.c @@ -138,15 +138,15 @@ static size_t net_rate_dn; static size_t net_rate_up; // lifetime statistics -static unsigned long long net_recv_errors; -static unsigned long long net_send_errors; +static uint64_t net_recv_errors; +static uint64_t net_send_errors; #if USE_ICMP -static unsigned long long net_icmp_errors; +static uint64_t net_icmp_errors; #endif -static unsigned long long net_bytes_rcvd; -static unsigned long long net_bytes_sent; -static unsigned long long net_packets_rcvd; -static unsigned long long net_packets_sent; +static uint64_t net_bytes_rcvd; +static uint64_t net_bytes_sent; +static uint64_t net_packets_rcvd; +static uint64_t net_packets_sent; //============================================================================= @@ -593,8 +593,10 @@ qboolean NET_GetPacket( netsrc_t sock ) { int ret; #if USE_ICMP int tries; +#ifndef _WIN32 int saved_error; #endif +#endif ioentry_t *e; if( udp_sockets[sock] == INVALID_SOCKET ) { @@ -1443,19 +1445,19 @@ static void NET_Stats_f( void ) { Com_FormatTime( buffer, sizeof( buffer ), diff ); Com_Printf( "Network uptime: %s\n", buffer ); - Com_Printf( "Bytes sent: %llu (%llu bytes/sec)\n", + Com_Printf( "Bytes sent: %"PRIu64" (%"PRIu64" bytes/sec)\n", net_bytes_sent, net_bytes_sent / diff ); - Com_Printf( "Bytes rcvd: %llu (%llu bytes/sec)\n", + Com_Printf( "Bytes rcvd: %"PRIu64" (%"PRIu64" bytes/sec)\n", net_bytes_rcvd, net_bytes_rcvd / diff ); - Com_Printf( "Packets sent: %llu (%llu packets/sec)\n", + Com_Printf( "Packets sent: %"PRIu64" (%"PRIu64" packets/sec)\n", net_packets_sent, net_packets_sent / diff ); - Com_Printf( "Packets rcvd: %llu (%llu packets/sec)\n", + Com_Printf( "Packets rcvd: %"PRIu64" (%"PRIu64" packets/sec)\n", net_packets_rcvd, net_packets_rcvd / diff ); #if USE_ICMP - Com_Printf( "Total errors: %llu/%llu/%llu (send/recv/icmp)\n", + Com_Printf( "Total errors: %"PRIu64"/%"PRIu64"/%"PRIu64" (send/recv/icmp)\n", net_send_errors, net_recv_errors, net_icmp_errors ); #else - Com_Printf( "Total errors: %llu/%llu (send/recv)\n", + Com_Printf( "Total errors: %"PRIu64"/%"PRIu64" (send/recv)\n", net_send_errors, net_recv_errors ); #endif Com_Printf( "Current upload rate: %"PRIz" bytes/sec\n", net_rate_up ); |