[asterisk-commits] may: branch may/ooh323_ipv6 r308200 - in /team/may/ooh323_ipv6: ./ addons/ooh...

[SVN commits to the Asterisk project]

Author: may
Date: Thu Feb 17 03:15:48 2011
New Revision: 308200

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=308200
Log:
Recorded merge of revisions 308099,308157 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r308099 | may | 2011-02-16 11:06:01 +0300 (Wed, 16 Feb 2011) | 9 lines
  
  Merged revisions 308098 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r308098 | may | 2011-02-16 10:57:22 +0300 (Wed, 16 Feb 2011) | 2 lines
    
    ifdef __linux__ keepalive variables also
  ........
................
  r308157 | pabelanger | 2011-02-17 01:02:41 +0300 (Thu, 17 Feb 2011) | 9 lines
  
  Merged revisions 308150 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r308150 | pabelanger | 2011-02-16 15:21:17 -0500 (Wed, 16 Feb 2011) | 2 lines
    
    Fix FreeBSD builds.
  ........
................

Modified:
    team/may/ooh323_ipv6/   (props changed)
    team/may/ooh323_ipv6/addons/ooh323c/src/ooSocket.c
    team/may/ooh323_ipv6/cel/cel_odbc.c   (props changed)
    team/may/ooh323_ipv6/configs/cel_odbc.conf.sample   (props changed)
    team/may/ooh323_ipv6/sounds/Makefile   (props changed)

Propchange: team/may/ooh323_ipv6/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Propchange: team/may/ooh323_ipv6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 17 03:15:48 2011
@@ -1,1 +1,1 @@
-/trunk:307751-307752
+/trunk:307751-307752,308099-308157

Propchange: team/may/ooh323_ipv6/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Feb 17 03:15:48 2011
@@ -1,1 +1,1 @@
-/trunk:1-308036
+/trunk:1-308199

Modified: team/may/ooh323_ipv6/addons/ooh323c/src/ooSocket.c
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_ipv6/addons/ooh323c/src/ooSocket.c?view=diff&rev=308200&r1=308199&r2=308200
==============================================================================
--- team/may/ooh323_ipv6/addons/ooh323c/src/ooSocket.c (original)
+++ team/may/ooh323_ipv6/addons/ooh323c/src/ooSocket.c Thu Feb 17 03:15:48 2011
@@ -199,7 +199,10 @@
 {
    int on;
    OOSOCKET sock;
-   int keepalive = 1, keepcnt = 24, keepidle = 120, keepintvl = 30;
+   int keepalive = 1;
+#ifdef __linux__
+   int keepcnt = 24, keepidle = 120, keepintvl = 30;
+#endif
    struct linger linger;
 
    if (family == 6) {

Propchange: team/may/ooh323_ipv6/cel/cel_odbc.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 17 03:15:48 2011
@@ -1,2 +1,2 @@
 /be/branches/C.3/cel/cel_adaptive_odbc.c:256426
-/trunk/cel/cel_odbc.c:290061-306867,307751-307752
+/trunk/cel/cel_odbc.c:290061-306867,307751-307752,308099-308157

Propchange: team/may/ooh323_ipv6/configs/cel_odbc.conf.sample
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 17 03:15:48 2011
@@ -1,2 +1,2 @@
 /be/branches/C.3/configs/cel_adaptive_odbc.conf.sample:256426
-/trunk/configs/cel_odbc.conf.sample:290061-306867,307751-307752
+/trunk/configs/cel_odbc.conf.sample:290061-306867,307751-307752,308099-308157

Propchange: team/may/ooh323_ipv6/sounds/Makefile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 17 03:15:48 2011
@@ -1,2 +1,2 @@
 /be/branches/C.3/sounds/Makefile:256426
-/trunk/sounds/Makefile:270974,290061-306867,307751-307752
+/trunk/sounds/Makefile:270974,290061-306867,307751-307752,308099-308157