iOS/MacOS PJSip socklen_t conflict with socket.h

[tony@xxxxxxxxxxx (Tony Million)]

Hi all, I noticed theres a redefinition conflict between socklen_t in

pjlib/include/pj/compat/os_darwin.h    (defined as int)

and between the base OS socket.h (defined as __darwin_socklen_t - which is __uint32_t)

The diff below fixes it and/or you could redefine it as typedef __darwin_socklen_t socklen_t;

Index: os_darwinos.h
===================================================================
--- os_darwinos.h	(revision 3362)
+++ os_darwinos.h	(working copy)
@@ -95,7 +95,10 @@
 /*
  * Socket related
  */
+#ifndef _SOCKLEN_T
+#define _SOCKLEN_T
 typedef int socklen_t;
+#endif
 
 /* Set 1 if native sockaddr_in has sin_len member. 
  * Default: 0