From 546e510fba3dcfc6375cf80e45528733c73eec6a Mon Sep 17 00:00:00 2001
From: kervala <devnull@localhost>
Date: Sun, 1 Aug 2010 09:53:45 +0200
Subject: [PATCH] Changed: #825 Remove all warning when compiling Ryzom

---
 code/nel/src/3d/driver/opengl/driver_opengl_states.cpp  | 4 ++--
 code/nel/src/3d/driver/opengl/driver_opengl_texture.cpp | 3 +--
 code/nel/src/misc/dynloadlib.cpp                        | 7 ++++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_states.cpp b/code/nel/src/3d/driver/opengl/driver_opengl_states.cpp
index c22b54f67..70924a51a 100644
--- a/code/nel/src/3d/driver/opengl/driver_opengl_states.cpp
+++ b/code/nel/src/3d/driver/opengl/driver_opengl_states.cpp
@@ -397,11 +397,11 @@ void			CDriverGLStates::alphaFunc(float threshold)
 
 
 // ***************************************************************************
-void			CDriverGLStates::stencilFunc(GLenum stencilFunc, GLint ref, GLuint mask)
+void			CDriverGLStates::stencilFunc(GLenum func, GLint ref, GLuint mask)
 {
 	H_AUTO_OGL(CDriverGLStates_stencilFunc)
 #ifndef NL3D_GLSTATE_DISABLE_CACHE
-	if((stencilFunc!=_CurStencilFunc) || (ref!=_CurStencilRef) || (mask!=_CurStencilMask))
+	if((func!=_CurStencilFunc) || (ref!=_CurStencilRef) || (mask!=_CurStencilMask))
 #endif
 	{
 		// new state
diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_texture.cpp b/code/nel/src/3d/driver/opengl/driver_opengl_texture.cpp
index 417851f58..d747fe793 100644
--- a/code/nel/src/3d/driver/opengl/driver_opengl_texture.cpp
+++ b/code/nel/src/3d/driver/opengl/driver_opengl_texture.cpp
@@ -1939,8 +1939,7 @@ bool CDriverGL::getRenderTargetSize (uint32 &width, uint32 &height)
 	}
 	else
 	{
-		width = _WindowWidth;
-		height = _WindowHeight;
+		getWindowSize(width, height);
 	}
 
 	return false;
diff --git a/code/nel/src/misc/dynloadlib.cpp b/code/nel/src/misc/dynloadlib.cpp
index fe46fa6f4..b047b1317 100644
--- a/code/nel/src/misc/dynloadlib.cpp
+++ b/code/nel/src/misc/dynloadlib.cpp
@@ -208,11 +208,12 @@ bool CLibrary::loadLibrary(const std::string &libName, bool addNelDecoration, bo
 	_LibHandle = nlLoadLibrary(libPath);
 	_LibFileName = libPath;
 	// MTR: some new error handling. Just logs if it couldn't load the handle.
-	if(_LibHandle == NULL) {
+	if(_LibHandle == NULL)
+	{
 #ifdef NL_OS_UNIX
-		char *errormsg=dlerror();
+		const char *errormsg = dlerror();
 #else
-		const char *errormsg="Verify DLL existence";
+		const char *errormsg = "Verify DLL existence";
 #endif
 		nlwarning("Loading library %s failed: %s", libPath.c_str(), errormsg);
 	}