diff options
author | Sami Kerola | 2012-07-25 21:15:43 +0200 |
---|---|---|
committer | Karel Zak | 2012-07-26 13:51:42 +0200 |
commit | 7560aebe7ea5153b46e8f63a83014e5fcb3a1e8c (patch) | |
tree | 532c03d88af70e720241d182d765db90d3e0ed92 /sys-utils/wdctl.c | |
parent | docs: clean up sulogin.8 manual (diff) | |
download | kernel-qcow2-util-linux-7560aebe7ea5153b46e8f63a83014e5fcb3a1e8c.tar.gz kernel-qcow2-util-linux-7560aebe7ea5153b46e8f63a83014e5fcb3a1e8c.tar.xz kernel-qcow2-util-linux-7560aebe7ea5153b46e8f63a83014e5fcb3a1e8c.zip |
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>
Diffstat (limited to 'sys-utils/wdctl.c')
-rw-r--r-- | sys-utils/wdctl.c | 2 |
1 files changed, 1 insertions, 1 deletions
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" |