aboutsummaryrefslogtreecommitdiffstats
path: root/kerncompat.h
diff options
context:
space:
mode:
authorMichal Marek <mmarek@suse.cz>2013-07-09 18:38:46 +0200
committerDavid Sterba <dsterba@suse.cz>2013-08-09 14:32:34 +0200
commit626123c2841a4307d5f18cf64141d774ae1f6f27 (patch)
treebe78c4ec5967e257cf9a94de618915c302ff5784 /kerncompat.h
parent309e50c7634f0603dab866ad699e7981e9fca004 (diff)
downloadbtrfs-progs-626123c2841a4307d5f18cf64141d774ae1f6f27.tar.gz
btrfs-progs-626123c2841a4307d5f18cf64141d774ae1f6f27.tar.xz
btrfs-progs-626123c2841a4307d5f18cf64141d774ae1f6f27.zip
btrfs-progs: fix duplicate __[su]* typedefs on ppc64
The <ext2fs/ext2_types.h> header does attempt to avoid conflicts with <linux/types.h>, but on ppc64, <asm-generic/int-ll64.h> gets somehow included by other headers. Include <linux/types.h> explicitly, so that <ext2fs/ext2_types.h> notices it. The proper fix would be to fix <ext2fs/ext2_types.h> to not use its own typedefs. Originally observed in btrfs-convert, put the include into kerncompat.h to avoid future problems. Signed-off-by: Michal Marek <mmarek@suse.cz> Signed-off-by: David Sterba <dsterba@suse.cz> Signed-off-by: Chris Mason <chris.mason@fusionio.com>
Diffstat (limited to 'kerncompat.h')
-rw-r--r--kerncompat.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/kerncompat.h b/kerncompat.h
index 6b4b4ba..ebb54b1 100644
--- a/kerncompat.h
+++ b/kerncompat.h
@@ -27,6 +27,7 @@
#include <byteswap.h>
#include <assert.h>
#include <stddef.h>
+#include <linux/types.h>
#ifndef READ
#define READ 0