summaryrefslogtreecommitdiff
path: root/restore.c
diff options
context:
space:
mode:
authorWade Cline <clinew@linux.vnet.ibm.com>2012-09-20 14:26:28 -0700
committerDavid Sterba <dsterba@suse.cz>2013-01-17 18:12:57 +0100
commit0d5cfddc2c8c34648ff21d99a1e34aae92ff25d0 (patch)
treee3a46250fc213e97da9292995983068fd9581961 /restore.c
parent91d9eec1ff044394f2b98ee7fcb76713dd33b994 (diff)
Btrfs-progs: Fix compiler warnings on PPC64
The kernel uses unsigned long long for u64, but PPC64 uses unsigned long by default. This results in compilation warnings such as: print-tree.c:333: warning: format '%llu' expects type 'long long unsigned int', but argument 4 has type 'u64' To fix this, the macro __KERNEL__ needs to be defined before including the file <asm/types.h>. This can be done by defining the macro in "kerncompat.h" and making it the first included file in the relevant header files; this fixes the compiler warnings on PPC64. Reviewed-by: David Sterba <dsterba@suse.cz> Signed-off-by: Wade Cline <clinew@linux.vnet.ibm.com>
Diffstat (limited to 'restore.c')
-rw-r--r--restore.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/restore.c b/restore.c
index b9e5381f..c447416a 100644
--- a/restore.c
+++ b/restore.c
@@ -18,6 +18,9 @@
#define _XOPEN_SOURCE 500
#define _GNU_SOURCE 1
+
+#include "kerncompat.h"
+
#include <ctype.h>
#include <stdio.h>
#include <stdlib.h>
@@ -25,7 +28,7 @@
#include <fcntl.h>
#include <sys/stat.h>
#include <zlib.h>
-#include "kerncompat.h"
+
#include "ctree.h"
#include "disk-io.h"
#include "print-tree.h"