From 7560aebe7ea5153b46e8f63a83014e5fcb3a1e8c Mon Sep 17 00:00:00 2001
From: Sami Kerola
Date: Wed, 25 Jul 2012 21:15:43 +0200
Subject: wdctl: fix conflicting types on old systems

The program wants the userland version of declaration(s), not the
kernel one.  Problem occured with glibc-devel-2.5-34.

/usr/include/stdint.h:41: error: conflicting types for 'int64_t'
/usr/include/linux/types.h:98: error: previous declaration of 'int64_t' was here
/usr/include/stdint.h:56: error: conflicting types for 'uint64_t'
/usr/include/linux/types.h:96: error: previous declaration of 'uint64_t' was here
In file included from /usr/include/stdlib.h:438,
                 from ./include/c.h:13,
                 from sys-utils/wdctl.c:30:

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---
 sys-utils/wdctl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'sys-utils/wdctl.c')

diff --git a/sys-utils/wdctl.c b/sys-utils/wdctl.c
index 10cabcfd6..760586449 100644
--- a/sys-utils/wdctl.c
+++ b/sys-utils/wdctl.c
@@ -18,13 +18,13 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-#include <linux/watchdog.h>
 #include <sys/ioctl.h>
 #include <getopt.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <signal.h>
 #include <assert.h>
+#include <linux/watchdog.h>
 
 #include "nls.h"
 #include "c.h"
-- 
cgit v1.2.3-55-g7522