From fe923a60ce9e670e269ce3f0a53b0d78126bf214 Mon Sep 17 00:00:00 2001 From: kervala Date: Sun, 1 Aug 2010 10:02:31 +0200 Subject: [PATCH] Changed: #825 Remove all warning when compiling Ryzom --- .../src/3d/driver/opengl/driver_opengl.cpp | 26 +++---------------- 1 file changed, 4 insertions(+), 22 deletions(-) diff --git a/code/nel/src/3d/driver/opengl/driver_opengl.cpp b/code/nel/src/3d/driver/opengl/driver_opengl.cpp index 72184e1aa..bbd0d4cd3 100644 --- a/code/nel/src/3d/driver/opengl/driver_opengl.cpp +++ b/code/nel/src/3d/driver/opengl/driver_opengl.cpp @@ -969,18 +969,9 @@ void CDriverGL::setupViewport (const class CViewport& viewport) if (_win == EmptyWindow) return; -#ifdef NL_MAC_NATIVE - - uint32 clientWidth, clientHeight; - NL3D::MAC::getWindowSize(_win, clientWidth, clientHeight); - -#else - // Setup gl viewport - sint clientWidth = _WindowWidth; - sint clientHeight = _WindowHeight; - -#endif // NL_MAC_NATIVE + uint32 clientWidth, clientHeight; + getWindowSize(clientWidth, clientHeight); // Backup the viewport _CurrViewport = viewport; @@ -1033,18 +1024,9 @@ void CDriverGL::setupScissor (const class CScissor& scissor) if (_win == EmptyWindow) return; -#ifdef NL_MAC_NATIVE - - uint32 clientWidth, clientHeight; - NL3D::MAC::getWindowSize(_win, clientWidth, clientHeight); - -#else - // Setup gl viewport - sint clientWidth = _WindowWidth; - sint clientHeight = _WindowHeight; - -#endif // NL_MAC_NATIVE + uint32 clientWidth, clientHeight; + getWindowSize(clientWidth, clientHeight); // Backup the scissor _CurrScissor= scissor;