From 27840e0d43ce342ec6838d4f6d2f3e9324079047 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= <mpg2@elzevir.fr>
Date: Mon, 5 Oct 2015 12:16:06 +0100
Subject: [PATCH] Fix compile error in net.c with musl libc

fixes #278
---
 ChangeLog     | 6 ++++++
 library/net.c | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 6f8181b5e..05450f660 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 PolarSSL ChangeLog
 
+= Version 1.2.17 released 2015-10-xx
+
+Bugfix
+   * Fix compile error in net.c with musl libc. Found and patch provided by
+     zhasha (#278).
+
 = Version 1.2.16 released 2015-09-17
 
 Security
diff --git a/library/net.c b/library/net.c
index 0e5edc01e..2685d6a04 100644
--- a/library/net.c
+++ b/library/net.c
@@ -268,7 +268,7 @@ int net_accept( int bind_fd, int *client_fd, void *client_ip )
     struct sockaddr_in client_addr;
 
 #if defined(__socklen_t_defined) || defined(_SOCKLEN_T) ||  \
-    defined(_SOCKLEN_T_DECLARED)
+    defined(_SOCKLEN_T_DECLARED) || defined(__DEFINED_socklen_t)
     socklen_t n = (socklen_t) sizeof( client_addr );
 #else
     int n = (int) sizeof( client_addr );