strongswan: Include musl.h after _GNU_SOURCE define 3039/head
authorHans Dedecker <dedeckeh@gmail.com>
Tue, 9 Aug 2016 12:55:04 +0000 (14:55 +0200)
committerHans Dedecker <dedeckeh@gmail.com>
Wed, 2 Nov 2016 12:44:43 +0000 (13:44 +0100)
musl.h was included before _GNU_SOURCE in 101-musl-fixes patch
leading to compilation issue on gcc (RTLD_DEFAULT not being
defined in dlfcn.h due to __USE_GNU not being set).
As described in the feature test macro man page feature macro
can be defined in the source code but need to be defined before
including any headers.

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
net/strongswan/patches/101-musl-fixes.patch

index ff7afa4eda4ab664cfe307f997ab87afdf15e562..cbb6c047d19ed8b38a415938024c9f74b1c6d597 100644 (file)
 +#undef encrypt
 --- a/src/libcharon/plugins/kernel_netlink/kernel_netlink_ipsec.c
 +++ b/src/libcharon/plugins/kernel_netlink/kernel_netlink_ipsec.c
-@@ -18,6 +18,8 @@
-  * for more details.
+@@ -19,6 +19,7 @@
   */
  
-+#include <musl.h>
-+
  #define _GNU_SOURCE
++#include <musl.h>
  #include <sys/types.h>
  #include <sys/socket.h>
+ #include <stdint.h>
 --- a/src/libcharon/plugins/kernel_netlink/kernel_netlink_net.c
 +++ b/src/libcharon/plugins/kernel_netlink/kernel_netlink_net.c
 @@ -37,6 +37,8 @@