Cross-merge networking fixes after downstream PR. No conflicts (or adjacent changes of note).
Showing the changes to include/uapi (1 of 550 files). Show all
Unified · Split
| @@ -29,6 +29,11 @@ · 28 unmodified lines | |||
| 29 | struct TAG { MEMBERS } ATTRS NAME; \ | 29 | struct TAG { MEMBERS } ATTRS NAME; \ |
| 30 | } | 30 | } |
| 31 | 31 | ||
| 32 | #ifdef __cplusplus | ||
| 33 | /* sizeof(struct{}) is 1 in C++, not 0, can't use C version of the macro. */ | ||
| 34 | #define __DECLARE_FLEX_ARRAY(T, member) \ | ||
| 35 | T member[0] | ||
| 36 | #else | ||
| 32 | /** | 37 | /** |
| 33 | * __DECLARE_FLEX_ARRAY() - Declare a flexible array usable in a union | 38 | * __DECLARE_FLEX_ARRAY() - Declare a flexible array usable in a union |
| 34 | * | 39 | * |
| @@ -49,3 +54,5 @@ · 14 unmodified lines | |||
| 49 | #ifndef __counted_by | 54 | #ifndef __counted_by |
| 50 | #define __counted_by(m) | 55 | #define __counted_by(m) |
| 51 | #endif | 56 | #endif |
| 57 | |||
| 58 | #endif /* _UAPI_LINUX_STDDEF_H */ | ||