You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by di...@apache.org on 2007/07/21 12:15:50 UTC
svn commit: r558285 - in /webservices/axis2/scratch/c/dinesh/602/c: ./
util/src/network_handler.c
Author: dinesh
Date: Sat Jul 21 03:15:44 2007
New Revision: 558285
URL: http://svn.apache.org/viewvc?view=rev&rev=558285
Log:
integrated to trunk
Modified:
webservices/axis2/scratch/c/dinesh/602/c/ (props changed)
webservices/axis2/scratch/c/dinesh/602/c/util/src/network_handler.c
Propchange: webservices/axis2/scratch/c/dinesh/602/c/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sat Jul 21 03:15:44 2007
@@ -1 +1 @@
-/webservices/axis2/scratch/c/neethi/axis2c:1-542109 /webservices/axis2/trunk/c:1-556670
+/webservices/axis2/scratch/c/neethi/axis2c:1-542109 /webservices/axis2/trunk/c:1-558284
Modified: webservices/axis2/scratch/c/dinesh/602/c/util/src/network_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/602/c/util/src/network_handler.c?view=diff&rev=558285&r1=558284&r2=558285
==============================================================================
--- webservices/axis2/scratch/c/dinesh/602/c/util/src/network_handler.c (original)
+++ webservices/axis2/scratch/c/dinesh/602/c/util/src/network_handler.c Sat Jul 21 03:15:44 2007
@@ -169,10 +169,15 @@
{
if (option == SO_RCVTIMEO || option == SO_SNDTIMEO)
{
- struct timeval tv;
- /* we deal with milliseconds */
- tv.tv_sec = value / 1000;
- tv.tv_usec = (value % 1000) * 1000;
+ #if defined(WIN32)
+ DWORD tv = value; //windows expects milliseconds in a DWORD
+ #else
+ struct timeval tv;
+ /* we deal with milliseconds */
+ tv.tv_sec = value / 1000;
+ tv.tv_usec = (value % 1000) * 1000;
+ #endif
+
setsockopt(socket, SOL_SOCKET, option, (char*) &tv, sizeof(tv));
return AXIS2_SUCCESS;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org