From 4bb365cda3dc5e496ebd5670a57c110509d14ac2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ste=CC=81phan=20Kochen?= <stephan@kochen.nl>
Date: Sun, 15 Jan 2012 02:36:03 +0100
Subject: [PATCH] Update to Csocket 6da41d339f

Fixes build on OS X.
---
 src/Csocket.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/Csocket.cpp b/src/Csocket.cpp
index c5b2b6c0..23b23b8f 100644
--- a/src/Csocket.cpp
+++ b/src/Csocket.cpp
@@ -437,15 +437,16 @@ int GetAddrInfo( const CS_STRING & sHostname, Csock *pSock, CSSockAddr & csSockA
 	if( pSock )
 		pSock->SetIPv6( false );
 	csSockAddr.SetIPv6( false );
-	if( __GetHostByName( sHostname, csSockAddr.GetAddr(), 3 ) == 0 )
-		return( 0 );
-#endif /* USE_GETHOSTBYNAME */
+	int iRet = __GetHostByName( sHostname, csSockAddr.GetAddr(), 3 );
+	return( iRet );
+#else
 	CGetAddrInfo cInfo( sHostname, pSock, csSockAddr );
 	cInfo.Init();
 	int iRet = cInfo.Process();
 	if( iRet != 0 )
 		return( iRet );
 	return( cInfo.Finish() );
+#endif /* USE_GETHOSTBYNAME */
 }
 
 int Csock::ConvertAddress( const struct sockaddr_storage * pAddr, socklen_t iAddrLen, CS_STRING & sIP, u_short * piPort )
@@ -583,7 +584,7 @@ static const char * CS_StrError( int iErrno, char * pszBuff, size_t uBuffLen )
 	return( strerror( iErrno ) );
 #else
 	memset( pszBuff, '\0', uBuffLen );
-#if (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !defined( _GNU_SOURCE )
+#if !defined( _GNU_SOURCE )
 	if( strerror_r( iErrno, pszBuff, uBuffLen ) == 0 )
 		return( pszBuff );
 #else