[svn-commits] file: branch 1.6.0 r648 - in /branches/1.6.0: ./ channels/ooh323c/src/ooSocket.c

[SVN commits to the Digium repositories]

Author: file
Date: Tue Jul 29 22:08:26 2008
New Revision: 648

URL: http://svn.digium.com/view/asterisk-addons?view=rev&rev=648
Log:
Merged revisions 647 via svnmerge from 
https://origsvn.digium.com/svn/asterisk-addons/trunk

........
r647 | file | 2008-07-30 00:07:14 -0300 (Wed, 30 Jul 2008) | 2 lines

Fix building of ooh323 on FreeBSD.

........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/ooh323c/src/ooSocket.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
--- trunk-merged (original)
+++ trunk-merged Tue Jul 29 22:08:26 2008
@@ -1,1 +1,1 @@
-/trunk:540-559,575,579,583,586,588,590,592,594,603,607,612,615,617,627
+/trunk:540-559,575,579,583,586,588,590,592,594,603,607,612,615,617,627,647

Modified: branches/1.6.0/channels/ooh323c/src/ooSocket.c
URL: http://svn.digium.com/view/asterisk-addons/branches/1.6.0/channels/ooh323c/src/ooSocket.c?view=diff&rev=648&r1=647&r2=648
==============================================================================
--- branches/1.6.0/channels/ooh323c/src/ooSocket.c (original)
+++ branches/1.6.0/channels/ooh323c/src/ooSocket.c Tue Jul 29 22:08:26 2008
@@ -608,7 +608,10 @@
       int flags;
       for (ifName = ifc.ifc_req; (void*)ifName < ifEndList; ifName++) {
          char *pName=NULL;
-         char addr[50], mask[50];
+         char addr[50];
+#ifdef ifr_netmask
+	 char mask[50];
+#endif
          
          pIf = (struct OOInterface*)memAlloc(pctxt, sizeof(struct OOInterface));
          pName = (char*)memAlloc(pctxt, strlen(ifName->ifr_name)+1);