From cb5c8d7bdcfc4e325cc13cd812ec1f7ed69703e1 Mon Sep 17 00:00:00 2001
From: Alexandre Janniaux <alexandre.janniaux@gmail.com>
Date: Fri, 4 Jan 2013 18:19:13 +0100
Subject: [PATCH] Fixes.

Former-commit-id: 85f7bb85e33acdd84d19191c845a1cc59bbb2138
---
 src/Nazara/Core/Posix/DynLibImpl.cpp |  2 +-
 src/Nazara/Core/Posix/FileImpl.cpp   |  2 +-
 src/Nazara/Core/Posix/FileImpl.hpp   |  2 ++
 src/Nazara/Core/Posix/MutexImpl.cpp  | 12 ++++++------
 src/Nazara/Core/Posix/MutexImpl.hpp  |  2 +-
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/Nazara/Core/Posix/DynLibImpl.cpp b/src/Nazara/Core/Posix/DynLibImpl.cpp
index 6dc2182c8..acc54f455 100644
--- a/src/Nazara/Core/Posix/DynLibImpl.cpp
+++ b/src/Nazara/Core/Posix/DynLibImpl.cpp
@@ -2,7 +2,7 @@
 // This file is part of the "Nazara Engine - Core module"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
-#include <Nazara/Core/Win32/DynLibImpl.hpp>
+#include <Nazara/Core/Posix/DynLibImpl.hpp>
 #include <Nazara/Core/DynLib.hpp>
 #include <Nazara/Core/Error.hpp>
 #include <Nazara/Core/String.hpp>
diff --git a/src/Nazara/Core/Posix/FileImpl.cpp b/src/Nazara/Core/Posix/FileImpl.cpp
index 38935fe12..1db95f04e 100644
--- a/src/Nazara/Core/Posix/FileImpl.cpp
+++ b/src/Nazara/Core/Posix/FileImpl.cpp
@@ -4,7 +4,7 @@
 
 #include <Nazara/Core/Posix/FileImpl.hpp>
 #include <Nazara/Core/Error.hpp>
-#include <Nazara/Core/Win32/Time.hpp>
+#include <Nazara/Core/Posix/Time.hpp>
 #include <Nazara/Core/Debug.hpp>
 #include <stdio.h>
 #include <unistd.h>
diff --git a/src/Nazara/Core/Posix/FileImpl.hpp b/src/Nazara/Core/Posix/FileImpl.hpp
index 7d2171cef..c7abdc1dc 100644
--- a/src/Nazara/Core/Posix/FileImpl.hpp
+++ b/src/Nazara/Core/Posix/FileImpl.hpp
@@ -7,7 +7,9 @@
 #ifndef NAZARA_FILEIMPL_HPP
 #define NAZARA_FILEIMPL_HPP
 
+#ifndef _LARGEFILE64_SOURCE
 #define _LARGEFILE64_SOURCE
+#endif
 
 #include <Nazara/Prerequesites.hpp>
 #include <Nazara/Core/File.hpp>
diff --git a/src/Nazara/Core/Posix/MutexImpl.cpp b/src/Nazara/Core/Posix/MutexImpl.cpp
index 1916eeb57..81615e71a 100644
--- a/src/Nazara/Core/Posix/MutexImpl.cpp
+++ b/src/Nazara/Core/Posix/MutexImpl.cpp
@@ -2,31 +2,31 @@
 // This file is part of the "Nazara Engine - Core module"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
-#include <Nazara/Core/Win32/MutexImpl.hpp>
+#include <Nazara/Core/Posix/MutexImpl.hpp>
 #include <Nazara/Core/Debug.hpp>
 
 NzMutexImpl::NzMutexImpl()
 {
     
-	pthread_mutex_init(&m_pmutex, NULL);
+	pthread_mutex_init(&m_handle, NULL);
 }
 
 NzMutexImpl::~NzMutexImpl()
 {
-    pthread_mutex_
+    pthread_mutex_destroy(&m_handle);
 }
 
 void NzMutexImpl::Lock()
 {
-	pthread_mutex_lock(&m_pmutex);
+	pthread_mutex_lock(&m_handle);
 }
 
 bool NzMutexImpl::TryLock()
 {
-    pthread_mutex_trylock(&m_pmutex) == 0;
+    pthread_mutex_trylock(&m_handle) == 0;
 }
 
 void NzMutexImpl::Unlock()
 {
-	pthread_mutex_unlock(&m_pmutex);
+	pthread_mutex_unlock(&m_handle);
 }
diff --git a/src/Nazara/Core/Posix/MutexImpl.hpp b/src/Nazara/Core/Posix/MutexImpl.hpp
index 33c4c65e4..0cb77e608 100644
--- a/src/Nazara/Core/Posix/MutexImpl.hpp
+++ b/src/Nazara/Core/Posix/MutexImpl.hpp
@@ -27,7 +27,7 @@ class NzMutexImpl
 		void Unlock();
 
 	private:
-		pthread_mutex_t m_pmutex;
+		pthread_mutex_t m_handle;
 };
 
 #endif // NAZARA_MUTEXIMPL_HPP