[ZNC-commits] SF.net SVN: znc:[1444] trunk

[<ps...@us...>]

Revision: 1444
          http://znc.svn.sourceforge.net/znc/?rev=1444&view=rev
Author:   psychon
Date:     2009-03-25 15:38:11 +0000 (Wed, 25 Mar 2009)

Log Message:
-----------
Update to latest Csocket

Modified Paths:
--------------
    trunk/Csocket.cpp
    trunk/Csocket.h

Modified: trunk/Csocket.cpp
===================================================================
--- trunk/Csocket.cpp	2009-03-24 18:50:11 UTC (rev 1443)
+++ trunk/Csocket.cpp	2009-03-25 15:38:11 UTC (rev 1444)
@@ -1,6 +1,6 @@
 /** @file
 *
-*    Copyright (c) 1999-2007 Jim Hull <ima...@im...>
+*    Copyright (c) 1999-2009 Jim Hull <ima...@im...>
 *    All rights reserved
 *
 * Redistribution and use in source and binary forms, with or without modification,
@@ -28,7 +28,7 @@
 * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *
 *
-* $Revision: 1.95 $
+* $Revision: 1.97 $
 */
 
 #include "Csocket.h"
@@ -397,7 +397,7 @@
 
 void __Perror( const CS_STRING & s, const char *pszFile, unsigned int iLineNo )
 {
-#if defined(__sun) || defined(_WIN32) || __NetBSD_Version__ < 4000000000
+#if defined(__sun) || defined(_WIN32) || (defined(__NetBSD_Version__) && __NetBSD_Version__ < 4000000000)
 	std::cerr << s << "(" << pszFile << ":" << iLineNo << "): " << strerror( GetSockError() ) << endl;
 #else
 	char buff[512];
@@ -1268,10 +1268,9 @@
 		// to keep openssl from spinning, just initiate the connection with 1 byte so the connection establishes faster
 		iBytesToSend = 1;
 	}
-	else if ( ( m_iMaxBytes > 0 ) && ( m_iMaxMilliSeconds > 0 ) )
-#else
-	if ( ( m_iMaxBytes > 0 ) && ( m_iMaxMilliSeconds > 0 ) )
+	else
 #endif /* HAVE_LIBSSL */
+	if ( ( m_iMaxBytes > 0 ) && ( m_iMaxMilliSeconds > 0 ) )
 	{
 		unsigned long long iNOW = millitime();
 		// figure out the shaping here

Modified: trunk/Csocket.h
===================================================================
--- trunk/Csocket.h	2009-03-24 18:50:11 UTC (rev 1443)
+++ trunk/Csocket.h	2009-03-25 15:38:11 UTC (rev 1444)
@@ -1,6 +1,6 @@
 /**
 *
-*    Copyright (c) 1999-2007 Jim Hull <ima...@im...>
+*    Copyright (c) 1999-2009 Jim Hull <ima...@im...>
 *    All rights reserved
 *
 * Redistribution and use in source and binary forms, with or without modification,
@@ -28,7 +28,7 @@
 * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *
 *
-* $Revision: 1.203 $
+* $Revision: 1.205 $
 */
 
 // note to compile with win32 need to link to winsock2, using gcc its -lws2_32


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.