From: Todd C. Miller <Todd.Miller@courtesan.com>
Date: Wed, 9 Feb 2011 20:09:03 +0000 (-0500)
Subject: Include utmp.h / utmpx.h before missing.h as apparently including it
X-Git-Tag: SUDO_1_7_5~16
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b7aad2b978c88f727d76640584646735ec758362;p=sudo

Include utmp.h / utmpx.h before missing.h as apparently including it
afterwards causes a compilation problem on GNU Hurd.

--HG--
branch : 1.7
---

diff --git a/boottime.c b/boottime.c
index 607cf74a7..bdcd1f2d2 100644
--- a/boottime.c
+++ b/boottime.c
@@ -42,7 +42,12 @@
 #if TIME_WITH_SYS_TIME
 # include <time.h>
 #endif
-
+#ifdef HAVE_GETUTXID
+# include <utmpx.h>
+#endif
+#ifdef HAVE_GETUTID
+# include <utmp.h>
+#endif
 #ifdef HAVE_SYSCTL
 # include <sys/sysctl.h>
 #endif
@@ -101,7 +106,6 @@ get_boottime(tv)
 
 #elif defined(HAVE_GETUTXID)
 
-#include <utmpx.h>
 int
 get_boottime(tv)
     struct timeval *tv;
@@ -120,7 +124,6 @@ get_boottime(tv)
 
 #elif defined(HAVE_GETUTID)
 
-#include <utmp.h>
 int
 get_boottime(tv)
     struct timeval *tv;