Frantisek Sumsal
a95ff98ec4
IPPROTO_L2TP was moved from linux/l2tp.h to linux/in.h [0], so let's
reflect that change to fix build with newer kernels:
```
In file included from ../src/libsystemd/sd-netlink/netlink-types-genl.c:10:
../src/basic/linux/l2tp.h:16: error: "IPPROTO_L2TP" redefined [-Werror]
16 | #define IPPROTO_L2TP 115
|
In file included from ../src/libsystemd/sd-netlink/netlink-types-genl.c:3:
/usr/include/netinet/in.h:85: note: this is the location of the previous definition
85 | #define IPPROTO_L2TP IPPROTO_L2TP
|
cc1: all warnings being treated as errors
```
When at it, update the rest of the headers we ship as well.
[0] https://github.com/torvalds/linux/commit/65b32f801bfbc54dc98144a6ec26082b59d131ee
47 lines
1.5 KiB
C
47 lines
1.5 KiB
C
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
|
|
#ifndef _UAPI_LINUX_STDDEF_H
|
|
#define _UAPI_LINUX_STDDEF_H
|
|
|
|
|
|
#ifndef __always_inline
|
|
#define __always_inline inline
|
|
#endif
|
|
|
|
/**
|
|
* __struct_group() - Create a mirrored named and anonyomous struct
|
|
*
|
|
* @TAG: The tag name for the named sub-struct (usually empty)
|
|
* @NAME: The identifier name of the mirrored sub-struct
|
|
* @ATTRS: Any struct attributes (usually empty)
|
|
* @MEMBERS: The member declarations for the mirrored structs
|
|
*
|
|
* Used to create an anonymous union of two structs with identical layout
|
|
* and size: one anonymous and one named. The former's members can be used
|
|
* normally without sub-struct naming, and the latter can be used to
|
|
* reason about the start, end, and size of the group of struct members.
|
|
* The named struct can also be explicitly tagged for layer reuse, as well
|
|
* as both having struct attributes appended.
|
|
*/
|
|
#define __struct_group(TAG, NAME, ATTRS, MEMBERS...) \
|
|
union { \
|
|
struct { MEMBERS } ATTRS; \
|
|
struct TAG { MEMBERS } ATTRS NAME; \
|
|
}
|
|
|
|
/**
|
|
* __DECLARE_FLEX_ARRAY() - Declare a flexible array usable in a union
|
|
*
|
|
* @TYPE: The type of each flexible array element
|
|
* @NAME: The name of the flexible array member
|
|
*
|
|
* In order to have a flexible array member in a union or alone in a
|
|
* struct, it needs to be wrapped in an anonymous struct with at least 1
|
|
* named member, but that member can be empty.
|
|
*/
|
|
#define __DECLARE_FLEX_ARRAY(TYPE, NAME) \
|
|
struct { \
|
|
struct { } __empty_ ## NAME; \
|
|
TYPE NAME[]; \
|
|
}
|
|
#endif
|