From: Maciej Żenczykowski <m...@google.com>
This fixes:
In file included from ethtool-copy.h:22:0,
from internal.h:32,
from ethtool.c:29:
.../include/linux/types.h:32:25: error: conflicting types for '__be64'
typedef __u64 __bitwise __be64;
^
In file included from ethtool.c:29:0:
internal.h:23:28: note: previous declaration of '__be64' was here
typedef unsigned long long __be64;
^
ethtool.c: In function 'do_gstats':
ethtool.c:3166:4: error: format '%llu' expects argument of type 'long long
unsigned int', but argument 5 has type '__u64' [-Werror=format=]
stats->data[i]);
^
ethtool.c: In function 'print_indir_table':
ethtool.c:3293:9: error: format '%llu' expects argument of type 'long long
unsigned int', but argument 3 has type '__u64' [-Werror=format=]
ctx->devname, ring_count->data);
^
Signed-off-by: Maciej Żenczykowski <m...@google.com>
Signed-off-by: David Decotigny <de...@googlers.com>
---
internal.h | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/internal.h b/internal.h
index b5ef646..5f8504d 100644
--- a/internal.h
+++ b/internal.h
@@ -3,6 +3,13 @@
#ifndef ETHTOOL_INTERNAL_H__
#define ETHTOOL_INTERNAL_H__
+#ifdef __powerpc64__
+/* Powerpc needs __SANE_USERSPACE_TYPES__ before <linux/types.h> to select
+ * 'int-ll64.h' and avoid compile warnings when printing __u64 with %llu.
+ */
+#define __SANE_USERSPACE_TYPES__
+#endif
+
#ifdef HAVE_CONFIG_H
#include "ethtool-config.h"
#endif
--
2.7.0.rc3.207.g0ac5344
