diff options
| author | John Crispin <john@openwrt.org> | 2015-05-23 15:29:31 +0000 |
|---|---|---|
| committer | John Crispin <john@openwrt.org> | 2015-05-23 15:29:31 +0000 |
| commit | 1cfe6b6847a7af393d43cd92c28f56450601c91e (patch) | |
| tree | 3b95b031c17093229e345d29a4cfaeb9bdf1f3f4 | |
| parent | 61c23c2eaaf7e6c6fbe4c959cd6b58807b663927 (diff) | |
| download | upstream-1cfe6b6847a7af393d43cd92c28f56450601c91e.tar.gz upstream-1cfe6b6847a7af393d43cd92c28f56450601c91e.tar.bz2 upstream-1cfe6b6847a7af393d43cd92c28f56450601c91e.zip | |
fuse: fix build on arm64
error:
../include/fuse_kernel.h:93:15: error: conflicting types for 'int64_t'
../include/fuse_kernel.h:92:15: error: conflicting types for 'uint64_t'
reported by buildbot
fix by adopting upstream patch:
http://git.baserock.org/cgi-bin/cgit.cgi/delta/fuse.git/commit/include/fuse_kernel.h?id=914871b20a901e3e1e981c92bc42b1c93b7ab81b
Signed-off-by: Dirk Neukirchen <dirkneukirchen@web.de>
SVN-Revision: 45740
| -rw-r--r-- | package/utils/fuse/patches/200-backport_arm64_fuse_kernel_h_clean_includes.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/package/utils/fuse/patches/200-backport_arm64_fuse_kernel_h_clean_includes.patch b/package/utils/fuse/patches/200-backport_arm64_fuse_kernel_h_clean_includes.patch new file mode 100644 index 0000000000..8436224e96 --- /dev/null +++ b/package/utils/fuse/patches/200-backport_arm64_fuse_kernel_h_clean_includes.patch @@ -0,0 +1,34 @@ +From 914871b20a901e3e1e981c92bc42b1c93b7ab81b Mon Sep 17 00:00:00 2001 +From: Riku Voipio <riku.voipio@linaro.org> +Date: Thu, 07 Feb 2013 11:04:21 +0000 +Subject: fuse_kernel.h: clean includes + +Use <linux/types.h> for linux and define types used for other operating systems +using <stdint.h> types. +--- +(limited to 'include/fuse_kernel.h') + +diff --git a/include/fuse_kernel.h b/include/fuse_kernel.h +index 501450c..df8e9b9 100644 +--- a/include/fuse_kernel.h ++++ b/include/fuse_kernel.h +@@ -91,12 +91,16 @@ + #ifndef _LINUX_FUSE_H + #define _LINUX_FUSE_H + +-#include <sys/types.h> ++#ifdef __linux__ ++#include <linux/types.h> ++#else ++#include <stdint.h> + #define __u64 uint64_t + #define __s64 int64_t + #define __u32 uint32_t + #define __s32 int32_t + #define __u16 uint16_t ++#endif + + /* + * Version negotiation: +-- +cgit v0.9.0.3-67-gacbf |