[asterisk-scf-commits] asterisk-scf/release/pjproject.git branch "master" updated.

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  167acb8e73f7e077867fe90e91110f66a017dd0d (commit)
       via  919b671e48c18a39fb132d916d5f1f3a95171c02 (commit)
      from  2c9dd387774f9d52b1fe5a3cea329a17a2a1ebe5 (commit)

Summary of changes:
 pjlib/include/pj/compat/os_darwinos.h |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)


- Log -----------------------------------------------------------------
commit 167acb8e73f7e077867fe90e91110f66a017dd0d
Merge: 2c9dd38 919b671
Author: David M. Lee <dlee at digium.com>
Date:   Tue Mar 13 08:20:20 2012 -0500

    Merge branch 'fix-osx'


commit 919b671e48c18a39fb132d916d5f1f3a95171c02
Author: David M. Lee <dlee at digium.com>
Date:   Mon Oct 24 14:43:30 2011 -0500

    Fix for OS X
    
    Asterisk SCF doesn't actually _work_ on OS X, but it can be useful to
    build on OS X.

diff --git a/pjlib/include/pj/compat/os_darwinos.h b/pjlib/include/pj/compat/os_darwinos.h
index 4afbe02..ea926fc 100644
--- a/pjlib/include/pj/compat/os_darwinos.h
+++ b/pjlib/include/pj/compat/os_darwinos.h
@@ -20,6 +20,8 @@
 #ifndef __PJ_COMPAT_OS_DARWINOS_H__
 #define __PJ_COMPAT_OS_DARWINOS_H__
 
+#include <sys/socket.h>
+
 /**
  * @file os_darwinos.h
  * @brief Describes Darwin/MacOSX operating system specifics.
@@ -92,11 +94,6 @@
 
 #define PJ_ATOMIC_VALUE_TYPE		long
 
-/*
- * Socket related
- */
-typedef int socklen_t;
-
 /* Set 1 if native sockaddr_in has sin_len member. 
  * Default: 0
  */

-----------------------------------------------------------------------


-- 
asterisk-scf/release/pjproject.git