fixed bug #34057 socklen_t should be a typedef

diff --git a/CHANGELOG b/CHANGELOG
index 4c35cba820063a9b3d2a29fd11c5135d1983d1ed..fcfde34b989cbcb2b805394633cd395d37789ad0 100644 (file)
--- 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 5ce4a4f9867fe7f32362eaddae0cec24dda91e55..e578a7b03bfbfd135cd7d7d6cbe92c9b1d8a0c39 100644 (file)
--- 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) */