From f12a1995e42d098217fef22cba6e7158ed76e635 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Sun, 28 Feb 2010 18:33:08 +0100
Subject: bugfix: fixed problem that caused compilation on FreeBSD 9.0 to fail.

bugtracker: http://bugzilla.adiscon.com/show_bug.cgi?id=181
Thanks to Christiano for reporting.
---
 tools/omusrmsg.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'tools/omusrmsg.c')

diff --git a/tools/omusrmsg.c b/tools/omusrmsg.c
index 499a11dd..fe3fb4d4 100644
--- a/tools/omusrmsg.c
+++ b/tools/omusrmsg.c
@@ -50,7 +50,11 @@
 #include <assert.h>
 #include <signal.h>
 #include <sys/param.h>
-#include <utmp.h>
+#ifdef HAVE_UTMP_X_H
+#  include <utmpx.h>
+#else
+#  include <utmp.h>
+#endif
 #include <unistd.h>
 #include <sys/uio.h>
 #include <sys/stat.h>
-- 
cgit v1.2.3


From 7b654060b624d976116d959f4cf799f940c00f0a Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Mon, 1 Mar 2010 07:57:24 +0100
Subject: fixed typo that (could have) caused compilation fail under FreeBSD

Note that I now also prefer to use utmp.h if it is present - this seems
to be much better under Linux.
---
 tools/omusrmsg.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'tools/omusrmsg.c')

diff --git a/tools/omusrmsg.c b/tools/omusrmsg.c
index fe3fb4d4..a89297d7 100644
--- a/tools/omusrmsg.c
+++ b/tools/omusrmsg.c
@@ -50,10 +50,10 @@
 #include <assert.h>
 #include <signal.h>
 #include <sys/param.h>
-#ifdef HAVE_UTMP_X_H
-#  include <utmpx.h>
-#else
+#ifdef HAVE_UTMP_H
 #  include <utmp.h>
+#else
+#  include <utmpx.h>
 #endif
 #include <unistd.h>
 #include <sys/uio.h>
-- 
cgit v1.2.3