[PATCH 3/5] wdctl: fix conflicting types on old systems

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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@xxxxxx>
---
 sys-utils/wdctl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-utils/wdctl.c b/sys-utils/wdctl.c
index ebe55b4..d5ca50c 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"
-- 
1.7.11.3

--
To unsubscribe from this list: send the line "unsubscribe util-linux" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Netdev]     [Ethernet Bridging]     [Linux Wireless]     [Kernel Newbies]     [Security]     [Linux for Hams]     [Netfilter]     [Bugtraq]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux RAID]     [Linux Admin]     [Samba]

  Powered by Linux