]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
wdctl: fix conflicting types on old systems
authorSami Kerola <kerolasa@iki.fi>
Wed, 25 Jul 2012 19:15:43 +0000 (21:15 +0200)
committerKarel Zak <kzak@redhat.com>
Thu, 26 Jul 2012 11:51:42 +0000 (13:51 +0200)
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

index 10cabcfd69b188cf2c539093586f6ea53d62f0c3..760586449ec8fc07cb7e815285f01fcc5ab7248d 100644 (file)
  * 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"