From 8399175d8ceff411cf8f50e17d7a066d7902c017 Mon Sep 17 00:00:00 2001
From: kervala <none@none>
Date: Sat, 30 Oct 2010 14:05:50 +0200
Subject: [PATCH] Changed: #825 Remove all warning when compiling Ryzom

---
 code/nel/src/3d/driver/opengl/driver_opengl.cpp          | 7 ++++---
 code/nel/src/3d/driver/opengl/unix_event_emitter.cpp     | 3 +--
 code/nel/src/3d/driver/opengl/unix_event_emitter.h       | 3 +--
 code/nel/src/misc/debug.cpp                              | 2 --
 code/nel/tools/3d/object_viewer_qt/src/particle_node.cpp | 2 +-
 code/nel/tools/3d/object_viewer_qt/src/particle_node.h   | 2 +-
 6 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/code/nel/src/3d/driver/opengl/driver_opengl.cpp b/code/nel/src/3d/driver/opengl/driver_opengl.cpp
index 7cc8e3f73..3383c9cdf 100644
--- a/code/nel/src/3d/driver/opengl/driver_opengl.cpp
+++ b/code/nel/src/3d/driver/opengl/driver_opengl.cpp
@@ -191,7 +191,7 @@ CDriverGL::CDriverGL()
 
 	// autorelease pool for memory management
 	_autoreleasePool = [[NSAutoreleasePool alloc] init];
-	
+
 	// init the application object
 	[NSApplication sharedApplication];
 
@@ -200,7 +200,7 @@ CDriverGL::CDriverGL()
 
 	// finish the application launching
 	[NSApp finishLaunching];
-	
+
 #elif defined (NL_OS_UNIX)
 
 	_cursor = None;
@@ -875,7 +875,7 @@ bool CDriverGL::swapBuffers()
 	// TODO: maybe do this somewhere else?
 	[_autoreleasePool release];
 	_autoreleasePool = [[NSAutoreleasePool alloc] init];
-	
+
 	[_ctx flushBuffer];
 	[containerView() display];
 
@@ -2077,6 +2077,7 @@ void	CDriverGL::setSwapVBLInterval(uint interval)
 uint	CDriverGL::getSwapVBLInterval()
 {
 	H_AUTO_OGL(CDriverGL_getSwapVBLInterval)
+
 #ifdef NL_OS_WINDOWS
 	if(_Extensions.WGLEXTSwapControl)
 	{
diff --git a/code/nel/src/3d/driver/opengl/unix_event_emitter.cpp b/code/nel/src/3d/driver/opengl/unix_event_emitter.cpp
index 3b08003f7..4ceb88116 100644
--- a/code/nel/src/3d/driver/opengl/unix_event_emitter.cpp
+++ b/code/nel/src/3d/driver/opengl/unix_event_emitter.cpp
@@ -22,8 +22,7 @@
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
 #include <X11/keysym.h>
-#include <GL/gl.h>
-#include <GL/glx.h>
+#include <X11/Xutil.h>
 #include "nel/misc/debug.h"
 
 
diff --git a/code/nel/src/3d/driver/opengl/unix_event_emitter.h b/code/nel/src/3d/driver/opengl/unix_event_emitter.h
index 1a17ecd1f..b42f45fb4 100644
--- a/code/nel/src/3d/driver/opengl/unix_event_emitter.h
+++ b/code/nel/src/3d/driver/opengl/unix_event_emitter.h
@@ -24,8 +24,7 @@
 
 #if defined(NL_OS_UNIX) && !defined(NL_OS_MAC)
 
-#include <GL/gl.h>
-#include <GL/glx.h>
+#include <X11/Xlib.h>
 
 namespace NLMISC {
 
diff --git a/code/nel/src/misc/debug.cpp b/code/nel/src/misc/debug.cpp
index 72a5b5a8f..9284217d6 100644
--- a/code/nel/src/misc/debug.cpp
+++ b/code/nel/src/misc/debug.cpp
@@ -1147,11 +1147,9 @@ void destroyDebug()
 
 void createDebug (const char *logPath, bool logInFile, bool eraseLastLog)
 {
-
 	// Do some basic compiler time check on type size
 	nlctassert(sizeof(char) == 1);
 
-
 //	static bool alreadyCreateSharedAmongThreads = false;
 //	if ( !alreadyCreateSharedAmongThreads )
 	if (!INelContext::getInstance().getAlreadyCreateSharedAmongThreads())
diff --git a/code/nel/tools/3d/object_viewer_qt/src/particle_node.cpp b/code/nel/tools/3d/object_viewer_qt/src/particle_node.cpp
index 357b1ac5d..828f75ec1 100644
--- a/code/nel/tools/3d/object_viewer_qt/src/particle_node.cpp
+++ b/code/nel/tools/3d/object_viewer_qt/src/particle_node.cpp
@@ -15,7 +15,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-#include "stdpch.h"
+#include "stdpch.h"
 #include "particle_node.h"
 
 // NeL includes
diff --git a/code/nel/tools/3d/object_viewer_qt/src/particle_node.h b/code/nel/tools/3d/object_viewer_qt/src/particle_node.h
index f512eaeac..85293d432 100644
--- a/code/nel/tools/3d/object_viewer_qt/src/particle_node.h
+++ b/code/nel/tools/3d/object_viewer_qt/src/particle_node.h
@@ -274,7 +274,7 @@ private:
 	TNodeVect		_Nodes;
 	// path + name of workspace
 	std::string		_Filename;  
-	bool			 _Modified;
+	bool			_Modified;
 	IModificationCallback	*_ModificationCallback;
 	// workspace user name
 	std::string		_Name;