diff options
author | Mikko Rapeli <mikko.rapeli@iki.fi> | 2014-08-31 06:58:46 -0400 |
---|---|---|
committer | Gabriel Laskar <gabriel@lse.epita.fr> | 2015-12-10 06:33:23 -0500 |
commit | 1a2a42c8bfa25ef0f7e14c5973c6a0bebe625a96 (patch) | |
tree | 9662dbf8655f2fbc8243f6d7ccf8f422e905ea3e | |
parent | 527e9316f8ec44bd53d90fb9f611fa7ffff52bb9 (diff) |
drm.h: use __kernel_size_t instead of size_t
Fall back to size_t for non Linux platforms.
Fixes userspace compilation error:
drm/drm.h:132:2: error: unknown type name ‘size_t’
Signed-off-by: Mikko Rapeli <mikko.rapeli@iki.fi>
-rw-r--r-- | include/uapi/drm/drm.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/include/uapi/drm/drm.h b/include/uapi/drm/drm.h index 3801584a0c53..b4e92eb12044 100644 --- a/include/uapi/drm/drm.h +++ b/include/uapi/drm/drm.h | |||
@@ -54,6 +54,7 @@ typedef int32_t __s32; | |||
54 | typedef uint32_t __u32; | 54 | typedef uint32_t __u32; |
55 | typedef int64_t __s64; | 55 | typedef int64_t __s64; |
56 | typedef uint64_t __u64; | 56 | typedef uint64_t __u64; |
57 | typedef size_t __kernel_size_t; | ||
57 | typedef unsigned long drm_handle_t; | 58 | typedef unsigned long drm_handle_t; |
58 | 59 | ||
59 | #endif | 60 | #endif |
@@ -129,11 +130,11 @@ struct drm_version { | |||
129 | int version_major; /**< Major version */ | 130 | int version_major; /**< Major version */ |
130 | int version_minor; /**< Minor version */ | 131 | int version_minor; /**< Minor version */ |
131 | int version_patchlevel; /**< Patch level */ | 132 | int version_patchlevel; /**< Patch level */ |
132 | size_t name_len; /**< Length of name buffer */ | 133 | __kernel_size_t name_len; /**< Length of name buffer */ |
133 | char __user *name; /**< Name of driver */ | 134 | char __user *name; /**< Name of driver */ |
134 | size_t date_len; /**< Length of date buffer */ | 135 | __kernel_size_t date_len; /**< Length of date buffer */ |
135 | char __user *date; /**< User-space buffer to hold date */ | 136 | char __user *date; /**< User-space buffer to hold date */ |
136 | size_t desc_len; /**< Length of desc buffer */ | 137 | __kernel_size_t desc_len; /**< Length of desc buffer */ |
137 | char __user *desc; /**< User-space buffer to hold desc */ | 138 | char __user *desc; /**< User-space buffer to hold desc */ |
138 | }; | 139 | }; |
139 | 140 | ||
@@ -143,7 +144,7 @@ struct drm_version { | |||
143 | * \sa drmGetBusid() and drmSetBusId(). | 144 | * \sa drmGetBusid() and drmSetBusId(). |
144 | */ | 145 | */ |
145 | struct drm_unique { | 146 | struct drm_unique { |
146 | size_t unique_len; /**< Length of unique */ | 147 | __kernel_size_t unique_len; /**< Length of unique */ |
147 | char __user *unique; /**< Unique name for driver instantiation */ | 148 | char __user *unique; /**< Unique name for driver instantiation */ |
148 | }; | 149 | }; |
149 | 150 | ||