From 614624790d167e0ebff23b52edafc20f4cd26534 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     | 8 +++++++-
 library/net.c | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 44f440819..5a8f63c7d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
 mbed TLS ChangeLog (Sorted per branch, date)
 
-= mbed TLS 1.3.13 reladsed 2015-09-17
+= mbed TLS 1.3.14 released 2015-10-xx
+
+Bugfix
+   * Fix compile error in net.c with musl libc. Found and patch provided by
+     zhasha (#278).
+
+= mbed TLS 1.3.13 released 2015-09-17
 
 Security
    * Fix possible client-side NULL pointer dereference (read) when the client
diff --git a/library/net.c b/library/net.c
index 1fb68842e..dcbe480e2 100644
--- a/library/net.c
+++ b/library/net.c
@@ -428,7 +428,7 @@ int net_accept( int bind_fd, int *client_fd, void *client_ip )
 #endif
 
 #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 );