From ee3d3835bda49851a3ef4cb88ac8df9dcd538562 Mon Sep 17 00:00:00 2001
From: DarkGuru <DarkGuru@67173fc5-114c-0410-ac8e-9d2fd5bffc1f>
Date: Tue, 27 May 2008 18:58:36 +0000
Subject: [PATCH] Fixes for Linux build (debian etch, i386 32 bit)

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@44 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
---
 code/3DSLoader.h       | 2 +-
 code/Assimp.cpp        | 2 +-
 code/ByteSwap.h        | 2 +-
 code/DefaultLogger.cpp | 2 ++
 code/PlyLoader.cpp     | 2 +-
 code/PlyParser.cpp     | 2 +-
 6 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/code/3DSLoader.h b/code/3DSLoader.h
index c330948be..723eb9f79 100644
--- a/code/3DSLoader.h
+++ b/code/3DSLoader.h
@@ -246,7 +246,7 @@ protected:
 	// -------------------------------------------------------------------
 	/** Clamp all indices in the file to a valid range
 	*/
-	void Dot3DSImporter::CheckIndices(Dot3DS::Mesh* sMesh);
+	void CheckIndices(Dot3DS::Mesh* sMesh);
 
 
 protected:
diff --git a/code/Assimp.cpp b/code/Assimp.cpp
index b9bb0cce8..3854f4a31 100644
--- a/code/Assimp.cpp
+++ b/code/Assimp.cpp
@@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "../include/assimp.h"
 #include "../include/assimp.hpp"
 
-#include "../include/aiassert.h"
+#include "../include/aiAssert.h"
 using namespace Assimp;
 
 #if (defined AI_C_THREADSAFE)
diff --git a/code/ByteSwap.h b/code/ByteSwap.h
index 54fa22d4f..f591a9ffe 100644
--- a/code/ByteSwap.h
+++ b/code/ByteSwap.h
@@ -43,7 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_BYTESWAP_H_INC
 #define AI_BYTESWAP_H_INC
 
-#include "..\include\aiAssert.h"
+#include "../include/aiAssert.h"
 
 namespace Assimp
 {
diff --git a/code/DefaultLogger.cpp b/code/DefaultLogger.cpp
index 554316f23..7afd8784c 100644
--- a/code/DefaultLogger.cpp
+++ b/code/DefaultLogger.cpp
@@ -221,9 +221,11 @@ void DefaultLogger::detatchStream( LogStream *pStream, unsigned int severity )
 DefaultLogger::DefaultLogger( const std::string &name, LogSeverity severity ) :
 	m_Severity( severity )
 {
+#ifdef WIN32
 	m_Streams.push_back( new Win32DebugLogStream() );
 	if (name.empty())
 		return;
+#endif
 	
 	m_Streams.push_back( new FileLogStream( name ) );
 }
diff --git a/code/PlyLoader.cpp b/code/PlyLoader.cpp
index ef175d97f..31ba9ce28 100644
--- a/code/PlyLoader.cpp
+++ b/code/PlyLoader.cpp
@@ -40,7 +40,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 /** @file Implementation of the PLY importer class */
-#include "PLYLoader.h"
+#include "PlyLoader.h"
 #include "MaterialSystem.h"
 
 #include "../include/IOStream.h"
diff --git a/code/PlyParser.cpp b/code/PlyParser.cpp
index 98947785b..38bcc6034 100644
--- a/code/PlyParser.cpp
+++ b/code/PlyParser.cpp
@@ -41,7 +41,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 /** @file Implementation of the PLY parser class */
 
-#include "PLYLoader.h"
+#include "PlyLoader.h"
 #include "MaterialSystem.h"
 #include "fast_atof.h"
 #include "../include/DefaultLogger.h"