Clashes with C++ `or` keyword
Showing the changes to include/uapi (1 of 1 file). Show all
Unified · Split
| @@ -186,7 +186,11 @@ struct drm_msm_gem_cpu_fini { · 185 unmodified lines | |||
| 186 | */ | 186 | */ |
| 187 | struct drm_msm_gem_submit_reloc { | 187 | struct drm_msm_gem_submit_reloc { |
| 188 | __u32 submit_offset; /* in, offset from submit_bo */ | 188 | __u32 submit_offset; /* in, offset from submit_bo */ |
| 189 | #ifdef __cplusplus | ||
| 190 | __u32 _or; /* in, value OR'd with result */ | ||
| 191 | #else | ||
| 189 | __u32 or; /* in, value OR'd with result */ | 192 | __u32 or; /* in, value OR'd with result */ |
| 193 | #endif | ||
| 190 | __s32 shift; /* in, amount of left shift (can be negative) */ | 194 | __s32 shift; /* in, amount of left shift (can be negative) */ |
| 191 | __u32 reloc_idx; /* in, index of reloc_bo buffer */ | 195 | __u32 reloc_idx; /* in, index of reloc_bo buffer */ |
| 192 | __u64 reloc_offset; /* in, offset from start of reloc_bo */ | 196 | __u64 reloc_offset; /* in, offset from start of reloc_bo */ |