22 lines
566 B
Diff
22 lines
566 B
Diff
|
diff -up fuse-2.9.2/include/fuse_kernel.h.conflictfix fuse-2.9.2/include/fuse_kernel.h
|
||
|
|
--- fuse-2.9.2/include/fuse_kernel.h.conflictfix 2013-06-26 09:31:57.862198038 -0400
|
||
|
|
+++ fuse-2.9.2/include/fuse_kernel.h 2013-06-26 09:32:19.679198365 -0400
|
||
|
|
@@ -88,12 +88,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:
|