Merge

code/ryzom/client/src/connection.cpp

@@ -981,7 +981,7 @@ TInterfaceState globalMenu()
 	while (PlayerWantToGoInGame == false)
 	{
 
-		#ifdef NL_DEBUG
+		#if defined(NL_OS_WINDOWS) && defined(NL_DEBUG)
 			// tmp for debug
 			if (::GetAsyncKeyState(VK_SPACE))
 			{
@@ -1064,7 +1064,7 @@ TInterfaceState globalMenu()
 			nlSleep(ClientCfg.Sleep);
 		}
 
-		#ifdef NL_DEBUG
+		#if defined(NL_OS_WINDOWS) && defined(NL_DEBUG)
 			if (::GetAsyncKeyState(VK_CONTROL))
 			{
 				pIM->displayUIViewBBoxs("");

code/ryzom/client/src/libwww.cpp

@@ -406,7 +406,7 @@ int requestTerminater (HTRequest * request, HTResponse * /* response */,
 	// the parameter is actually an uint32
 	if (param != 0)
 	{
-		CGroupHTML::TGroupHtmlByUIDMap::iterator	it= CGroupHTML::_GroupHtmlByUID.find((uint32)param);
+		CGroupHTML::TGroupHtmlByUIDMap::iterator	it= CGroupHTML::_GroupHtmlByUID.find((uint32)(size_t)param);
 		if(it!=CGroupHTML::_GroupHtmlByUID.end())
 		{
 			// get the pointer. NB: the refptr should not be NULL

code/ryzom/client/src/login_patch.cpp

@@ -1197,7 +1197,7 @@ void CPatchManager::downloadFileWithCurl (const string &source, const string &de
 			// file not found, delete local file
 			throw Exception ("curl init failed");
 		}
-		curl_easy_setopt(curl, CURLOPT_NOPROGRESS, FALSE);
+		curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 0);
 		curl_easy_setopt(curl, CURLOPT_PROGRESSFUNCTION, downloadProgressFunc);
 		curl_easy_setopt(curl, CURLOPT_PROGRESSDATA, (void *) progress);
 		curl_easy_setopt(curl, CURLOPT_URL, source.c_str());