From: Hans Dedecker <redacted>
Date: Wed, 9 Nov 2016 10:18:38 +0000 (+0100)
Subject: strongswan: Fix compile error due to __kernel_nlink_t being re-defined
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=8b69c8666451d996ddc6695e9db698a621d164bb;p=openwrt-packages.git

strongswan: Fix compile error due to __kernel_nlink_t being re-defined

Patch 101-musl-fixes defines __kernel_nlink_t as void; but using
a pre-3.6.11 kernel on an arm cortex defines __kernel_nlink_t as
unsigned short using uclibc
Fix the compile issue by not redefining __kernel_nlink_t

Signed-off-by: Hans Dedecker <redacted>
---

diff --git a/net/strongswan/patches/101-musl-fixes.patch b/net/strongswan/patches/101-musl-fixes.patch
index cbb6c047d..e48d22b41 100644
--- a/net/strongswan/patches/101-musl-fixes.patch
+++ b/net/strongswan/patches/101-musl-fixes.patch
@@ -10,7 +10,7 @@
  
 --- /dev/null
 +++ b/src/libstrongswan/musl.h
-@@ -0,0 +1,39 @@
+@@ -0,0 +1,38 @@
 +#include <sys/types.h>
 +
 +#define crypt x_crypt
@@ -31,7 +31,6 @@
 +#define nlink_t x_nlink_t
 +#define timer_t x_timer_t
 +#define blkcnt_t x_blkcnt_t
-+#define __kernel_nlink_t void
 +
 +#include <linux/types.h>
 +