Merge commit 'upstream/1.7.6p1'
[debian/sudo] / debian / patches / hurd-have-getutid.diff
1 diff --git a/boottime.c b/boottime.c
2 index f75af3e..843aeca 100644
3 --- a/boottime.c
4 +++ b/boottime.c
5 @@ -47,6 +47,14 @@
6  # include <sys/sysctl.h>
7  #endif
8  
9 +/* Must be included above "compat.h"!!  */
10 +#if defined(HAVE_GETUTXID)
11 +#include <utmpx.h>
12 +#elif defined(HAVE_GETUTID)
13 +#include <utmp.h>
14 +#else
15 +#endif
16 +
17  #include "compat.h"
18  #include "missing.h"
19  
20 @@ -102,7 +110,6 @@ get_boottime(tv)
21  
22  #elif defined(HAVE_GETUTXID)
23  
24 -#include <utmpx.h>
25  int
26  get_boottime(tv)
27      struct timeval *tv;
28 @@ -121,7 +128,6 @@ get_boottime(tv)
29  
30  #elif defined(HAVE_GETUTID)
31  
32 -#include <utmp.h>
33  int
34  get_boottime(tv)
35      struct timeval *tv;