From: Florian Forster <ff@octo.it>
Date: Sun, 19 Mar 2017 09:53:40 +0000 (+0100)
Subject: Merge commit 'refs/pull/15/head' of github.com:octo/liboping
X-Git-Url: https://git.octo.it/?p=liboping.git;a=commitdiff_plain;h=8f47022a866853da6477272b2c69855a1e2cff13;hp=6dd28d58d7a15aede4512185e987b5453a7e6249

Merge commit 'refs/pull/15/head' of github.com:octo/liboping
---

diff --git a/configure.ac b/configure.ac
index 266bfa3..60138fc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -201,8 +201,6 @@ AC_SUBST(LIBOPING_PC_LIBS_PRIVATE)
 
 AC_SEARCH_LIBS([nanosleep],[rt],[],
 		[AC_MSG_ERROR([cannot find nanosleep])])
-AC_SEARCH_LIBS([clock_gettime],[rt],[],
-		[AC_MSG_ERROR([cannot find clock_gettime])])
 
 AC_ARG_WITH(ncurses, AS_HELP_STRING([--with-ncurses], [Build oping CLI tool with ncurses support]))
 AS_IF([test "x$with_ncurses" != "xno"], [
diff --git a/src/oping.c b/src/oping.c
index bac45f0..9ac87bf 100644
--- a/src/oping.c
+++ b/src/oping.c
@@ -1366,10 +1366,11 @@ static int pre_loop_hook (pingobj_t *ping) /* {{{ */
 	if (has_colors () == TRUE)
 	{
 		start_color ();
-		init_pair (OPING_GREEN,  COLOR_GREEN,  /* default = */ 0);
-		init_pair (OPING_YELLOW, COLOR_YELLOW, /* default = */ 0);
-		init_pair (OPING_RED,    COLOR_RED,    /* default = */ 0);
-		init_pair (OPING_GREEN_HIST,  COLOR_GREEN,  COLOR_BLACK);
+		use_default_colors ();
+		init_pair (OPING_GREEN,  COLOR_GREEN,  /* default = */ -1);
+		init_pair (OPING_YELLOW, COLOR_YELLOW, /* default = */ -1);
+		init_pair (OPING_RED,    COLOR_RED,    /* default = */ -1);
+		init_pair (OPING_GREEN_HIST,  COLOR_GREEN,  -1);
 		init_pair (OPING_YELLOW_HIST, COLOR_YELLOW, COLOR_GREEN);
 		init_pair (OPING_RED_HIST,    COLOR_RED,    COLOR_YELLOW);
 	}
@@ -1620,11 +1621,10 @@ static void update_host_hook (pingobj_iter_t *iter, /* {{{ */
 
 	if (outfile != NULL)
 	{
-		struct timespec ts = { 0, 0 };
-
-		if (clock_gettime (CLOCK_REALTIME, &ts) == 0)
+		struct timeval tv = {0};
+		if (gettimeofday (&tv, NULL) == 0)
 		{
-			double t = ((double) ts.tv_sec) + (((double) ts.tv_nsec) / 1000000000.0);
+			double t = ((double) tv.tv_sec) + (((double) tv.tv_usec) / 1000000.0);
 
 			if ((sequence % 32) == 0)
 				fprintf (outfile, "#time,host,latency[ms]\n");