diff options
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/Makefile.in | 9 | ||||
| -rw-r--r-- | src/include/linux/xfrm.h | 3 |
2 files changed, 12 insertions, 0 deletions
diff --git a/src/include/Makefile.in b/src/include/Makefile.in index b9b758193..b02da80c0 100644 --- a/src/include/Makefile.in +++ b/src/include/Makefile.in @@ -172,7 +172,13 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ ipsecdir = @ipsecdir@ +<<<<<<< HEAD +ipsecgid = @ipsecgid@ ipsecgroup = @ipsecgroup@ +ipsecuid = @ipsecuid@ +======= +ipsecgroup = @ipsecgroup@ +>>>>>>> upstream/4.5.1 ipsecuser = @ipsecuser@ libcharon_plugins = @libcharon_plugins@ libdir = @libdir@ @@ -211,8 +217,11 @@ sbindir = @sbindir@ scepclient_plugins = @scepclient_plugins@ scripts_plugins = @scripts_plugins@ sharedstatedir = @sharedstatedir@ +<<<<<<< HEAD +======= soup_CFLAGS = @soup_CFLAGS@ soup_LIBS = @soup_LIBS@ +>>>>>>> upstream/4.5.1 srcdir = @srcdir@ strongswan_conf = @strongswan_conf@ sysconfdir = @sysconfdir@ diff --git a/src/include/linux/xfrm.h b/src/include/linux/xfrm.h index 930fdd2de..92d9258df 100644 --- a/src/include/linux/xfrm.h +++ b/src/include/linux/xfrm.h @@ -283,7 +283,10 @@ enum xfrm_attr_type_t { XFRMA_KMADDRESS, /* struct xfrm_user_kmaddress */ XFRMA_ALG_AUTH_TRUNC, /* struct xfrm_algo_auth */ XFRMA_MARK, /* struct xfrm_mark */ +<<<<<<< HEAD +======= XFRMA_TFCPAD, /* __u32 */ +>>>>>>> upstream/4.5.1 __XFRMA_MAX #define XFRMA_MAX (__XFRMA_MAX - 1) |