From 2e69b54a4f2566b604878657f9d11ac8cbc4eecd Mon Sep 17 00:00:00 2001
From: Simon Goldschmidt <goldsimon@gmx.de>
Date: Wed, 24 Aug 2011 20:22:21 +0200
Subject: [PATCH] fixed bug #34057 socklen_t should be a typedef

---
 CHANGELOG                  | 3 +++
 src/include/lwip/sockets.h | 6 ++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 4c35cba8..fcfde34b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -41,6 +41,9 @@ HISTORY
 
  ++ Bugfixes:
 
+  2011-08-24: Simon Goldschmidt
+  * sockets.h: fixed bug #34057 socklen_t should be a typedef
+
   2011-08-24: Simon Goldschmidt
   * pbuf.c: fixed bug #34112 Odd check in pbuf_alloced_custom (typo)
 
diff --git a/src/include/lwip/sockets.h b/src/include/lwip/sockets.h
index 5ce4a4f9..e578a7b0 100644
--- a/src/include/lwip/sockets.h
+++ b/src/include/lwip/sockets.h
@@ -78,8 +78,10 @@ struct sockaddr {
 #endif /* LWIP_IPV6 */
 };
 
-#ifndef socklen_t
-#  define socklen_t u32_t
+/* If your port already typedef's socklen_t, define SOCKLEN_T_DEFINED
+   to prevent this code from redefining it. */
+#if !defined(socklen_t) && !defined(SOCKLEN_T_DEFINED)
+typedef u32_t socklen_t;
 #endif
 
 /* Socket protocol types (TCP/UDP/RAW) */