]>
Commit | Line | Data |
---|---|---|
7502d6f8 MT |
1 | diff -up fuse-2.9.2/include/fuse_kernel.h.conflictfix fuse-2.9.2/include/fuse_kernel.h |
2 | --- fuse-2.9.2/include/fuse_kernel.h.conflictfix 2013-06-26 09:31:57.862198038 -0400 | |
3 | +++ fuse-2.9.2/include/fuse_kernel.h 2013-06-26 09:32:19.679198365 -0400 | |
4 | @@ -88,12 +88,16 @@ | |
5 | #ifndef _LINUX_FUSE_H | |
6 | #define _LINUX_FUSE_H | |
7 | ||
8 | -#include <sys/types.h> | |
9 | +#ifdef __linux__ | |
10 | +#include <linux/types.h> | |
11 | +#else | |
12 | +#include <stdint.h> | |
13 | #define __u64 uint64_t | |
14 | #define __s64 int64_t | |
15 | #define __u32 uint32_t | |
16 | #define __s32 int32_t | |
17 | #define __u16 uint16_t | |
18 | +#endif | |
19 | ||
20 | /* | |
21 | * Version negotiation: |