summaryrefslogtreecommitdiffstats
path: root/base/libcap/libcap-2.16-drop-linux-workarounds.patch
blob: bbd6db8357db106c7ea9d677f47f2672edf49234 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
dont need these compat hacks anymore

http://bugs.gentoo.org/265304

--- libcap/include/sys/capability.h
+++ libcap/include/sys/capability.h
@@ -22,18 +22,6 @@
 #include <sys/types.h>
 #include <stdint.h>
 
-/*
- * Make sure we can be included from userland by preventing
- * capability.h from including other kernel headers
- */
-#define _LINUX_TYPES_H
-#define _LINUX_FS_H
-#define __LINUX_COMPILER_H
-#define __user
-
-typedef unsigned int __u32;
-typedef __u32 __le32;
-
 #include <linux/capability.h>
 
 /*
--- libcap/include/linux/capability.h
+++ libcap/include/linux/capability.h
@@ -40,13 +40,13 @@
 typedef struct __user_cap_header_struct {
 	__u32 version;
 	int pid;
-} __user *cap_user_header_t;
+} *cap_user_header_t;
 
 typedef struct __user_cap_data_struct {
         __u32 effective;
         __u32 permitted;
         __u32 inheritable;
-} __user *cap_user_data_t;
+} *cap_user_data_t;
 
 
 #define XATTR_CAPS_SUFFIX "capability"