patch from Svante Signell to fix build problem on GNU/Hurd, closes: #611290
authorBdale Garbee <bdale@gag.com>
Wed, 9 Feb 2011 18:31:37 +0000 (11:31 -0700)
committerBdale Garbee <bdale@gag.com>
Wed, 9 Feb 2011 18:31:37 +0000 (11:31 -0700)
debian/patches/hurd-have-getutid.diff [new file with mode: 0644]
debian/patches/series

diff --git a/debian/patches/hurd-have-getutid.diff b/debian/patches/hurd-have-getutid.diff
new file mode 100644 (file)
index 0000000..f6968dc
--- /dev/null
@@ -0,0 +1,35 @@
+diff --git a/boottime.c b/boottime.c
+index f75af3e..843aeca 100644
+--- a/boottime.c
++++ b/boottime.c
+@@ -47,6 +47,14 @@
+ # include <sys/sysctl.h>
+ #endif
++/* Must be included above "compat.h"!!  */
++#if defined(HAVE_GETUTXID)
++#include <utmpx.h>
++#elif defined(HAVE_GETUTID)
++#include <utmp.h>
++#else
++#endif
++
+ #include "compat.h"
+ #include "missing.h"
+@@ -102,7 +110,6 @@ get_boottime(tv)
+ #elif defined(HAVE_GETUTXID)
+-#include <utmpx.h>
+ int
+ get_boottime(tv)
+     struct timeval *tv;
+@@ -121,7 +128,6 @@ get_boottime(tv)
+ #elif defined(HAVE_GETUTID)
+-#include <utmp.h>
+ int
+ get_boottime(tv)
+     struct timeval *tv;
index 178a4c4eac63eaace4c0b6fec4f4559badb3cbf5..ba3c21bc900e7694f317ffb9d6073a924ba4d8d3 100644 (file)
@@ -1,3 +1,4 @@
 typo-in-classic-insults.diff
 env.c-safety.diff
 paths-in-samples.diff
+hurd-have-getutid.diff