29 lines
666 B
Diff
29 lines
666 B
Diff
|
From: Tom Callaway <spot@fedoraproject.org>
|
||
|
|
Date: Wed, 26 Jun 2013 09:34:52 -0400
|
||
|
|
Subject: [PATCH] add fix for namespace conflict in fuse_kernel.h
|
||
|
|
|
||
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=970768
|
||
|
|
|
||
|
|
diff --git a/include/fuse_kernel.h b/include/fuse_kernel.h
|
||
|
|
index c632b58..9e02fe3 100644
|
||
|
|
--- a/include/fuse_kernel.h
|
||
|
|
+++ b/include/fuse_kernel.h
|
||
|
|
@@ -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:
|