From: Guus Sliepen <guus@tinc-vpn.org>
Date: Thu, 2 Jun 2011 21:40:27 +0000 (+0200)
Subject: Small fixes for Windows.
X-Git-Tag: release-1.1pre1~16
X-Git-Url: https://git.tinc-vpn.org/git/browse?a=commitdiff_plain;h=5f4d57e846b566e80557c57a72e2bad562f66e7b;p=tinc

Small fixes for Windows.
---

diff --git a/src/tincd.c b/src/tincd.c
index 84971495..704e96e3 100644
--- a/src/tincd.c
+++ b/src/tincd.c
@@ -64,7 +64,7 @@
 #include "xalloc.h"
 
 /* The name this program was run with. */
-static char *program_name = NULL;
+char *program_name = NULL;
 
 /* If nonzero, display usage information and exit. */
 static bool show_help = false;
diff --git a/src/top.c b/src/top.c
index 373b180f..b71bcb85 100644
--- a/src/top.c
+++ b/src/top.c
@@ -61,6 +61,10 @@ static bool changed = true;
 static const char *unit = "bytes";
 static float scale = 1;
 
+#ifndef timersub
+#define timersub(a, b, c) do {(c)->tv_sec = (a)->tv_sec - (b)->tv_sec; (c)->tv_usec = (a)->tv_usec = (b)->tv_usec;} while(0)
+#endif
+
 static void update(int fd) {
 	sendline(fd, "%d %d", CONTROL, REQ_DUMP_TRAFFIC);
 	gettimeofday(&now, NULL);
@@ -136,7 +140,7 @@ static void update(int fd) {
 static void redraw(void) {
 	erase();
 
-	mvprintw(0, 0, "Tinc %-16s  Nodes: %4d  Sort: %-8s  %s", netname, node_list.count, sortname[sortmode], cumulative ? "Cumulative" : "Current");
+	mvprintw(0, 0, "Tinc %-16s  Nodes: %4d  Sort: %-8s  %s", netname ?: "", node_list.count, sortname[sortmode], cumulative ? "Cumulative" : "Current");
 	attrset(A_REVERSE);
 	mvprintw(2, 0, "Node                IN pkts   IN %s   OUT pkts  OUT %s", unit, unit);
 	chgat(-1, A_REVERSE, 0, NULL);
@@ -221,10 +225,10 @@ static void redraw(void) {
 			attrset(A_DIM);
 
 		if(cumulative)
-			mvprintw(row, 0, "%-16s %'10"PRIu64" %'10.0f %'10"PRIu64" %'10.0f",
+			mvprintw(row, 0, "%-16s %10"PRIu64" %10.0f %10"PRIu64" %10.0f",
 					node->name, node->in_packets, node->in_bytes * scale, node->out_packets, node->out_bytes * scale);
 		else
-			mvprintw(row, 0, "%-16s %'10.0f %'10.0f %'10.0f %'10.0f",
+			mvprintw(row, 0, "%-16s %10.0f %10.0f %10.0f %10.0f",
 					node->name, node->in_packets_rate, node->in_bytes_rate * scale, node->out_packets_rate, node->out_bytes_rate * scale);
 	}