[asterisk-commits] may: trunk r308099 - in /trunk: ./ addons/ooh323c/src/ooSocket.c

[SVN commits to the Asterisk project]

Author: may
Date: Wed Feb 16 02:06:01 2011
New Revision: 308099

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=308099
Log:
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
........

Modified:
    trunk/   (props changed)
    trunk/addons/ooh323c/src/ooSocket.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/addons/ooh323c/src/ooSocket.c
URL: http://svnview.digium.com/svn/asterisk/trunk/addons/ooh323c/src/ooSocket.c?view=diff&rev=308099&r1=308098&r2=308099
==============================================================================
--- trunk/addons/ooh323c/src/ooSocket.c (original)
+++ trunk/addons/ooh323c/src/ooSocket.c Wed Feb 16 02:06:01 2011
@@ -191,7 +191,9 @@
 int ooSocketCreate (OOSOCKET* psocket) 
 {
    int on;
+#ifdef __linux__
    int keepalive = 1, keepcnt = 24, keepidle = 120, keepintvl = 30;
+#endif
    struct linger linger;
    OOSOCKET sock = socket (AF_INET,
                              SOCK_STREAM,