From 2b35698cad740d1854a4cc160b86a5816149027a Mon Sep 17 00:00:00 2001
From: Sascha Wessel <wessel@nefkom.net>
Date: Mon, 10 Nov 2008 13:53:22 +0100
Subject: [PATCH] Cleanup

---
 Makefile.am |  2 +-
 fso-gpsd.c  | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 99ee525..34a5ccd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,3 @@
 AM_CFLAGS = $(PACKAGES_CFLAGS)
-LDADD = $(PACKAGES_LIBS) -lm
+AM_LDFLAGS = $(PACKAGES_LIBS) -lm
 sbin_PROGRAMS = fso-gpsd
diff --git a/fso-gpsd.c b/fso-gpsd.c
index 4e9e867..0d18677 100644
--- a/fso-gpsd.c
+++ b/fso-gpsd.c
@@ -29,6 +29,7 @@
 #include <fcntl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/time.h>
 #include <dbus/dbus-glib.h>
 #include <glib-object.h>
 #include <glib.h>
@@ -50,7 +51,7 @@
 #define ERROR(...)							\
 	do {								\
 		g_log(NULL, G_LOG_LEVEL_ERROR, __VA_ARGS__);		\
-		for (;;);						\
+		abort();						\
 	} while (0)
 
 #define CRITICAL(...)							\
@@ -1917,17 +1918,17 @@ log_handler(
 				level_string, message);
 		}
 	} else {
-		GTimeVal tv;
+		struct timeval tv = { 0, 0 };
 
-		g_get_current_time(&tv);
+		gettimeofday(&tv, NULL);
 
 		if (domain) {
 			fprintf(stderr, "%li.%06li %s: %s%s\n",
-				tv.tv_sec, tv.tv_usec, domain,
-				level_string, message);
+				(long) tv.tv_sec, (long) tv.tv_usec,
+				domain, level_string, message);
 		} else {
 			fprintf(stderr, "%li.%06li %s%s\n",
-				tv.tv_sec, tv.tv_usec,
+				(long) tv.tv_sec, (long) tv.tv_usec,
 				level_string, message);
 		}
 	}
-- 
2.11.4.GIT