sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix compilation errors for POSIX files and make premake4-linux executable.

Browse Source 
Former-commit-id: bb094585a678b983e25b55c4fab00665e66f64c5
This commit is contained in:
Alexandre Janniaux
2013-01-05 01:53:54 +01:00
parent 9e0d263694
commit c2e197bda5
8 changed files with 34 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Nazara/Core/Posix/ThreadImpl.cpp
View File

@@ -5,7 +5,6 @@
#include <Nazara/Core/Posix/ThreadImpl.hpp>
#include <Nazara/Core/Error.hpp>
#include <Nazara/Core/Functor.hpp>
#include <process.h>
#include <unistd.h>
#include <sys/time.h>
#include <Nazara/Core/Debug.hpp>
@@ -27,13 +26,13 @@ void NzThreadImpl::Join()
pthread_join(m_handle, nullptr);
}
unsigned int NzThreadImpl::ThreadProc(void* userdata)
void* NzThreadImpl::ThreadProc(void* userdata)
{
NzFunctor* func = static_cast<NzFunctor*>(userdata);
func->Run();
delete func;
return 0;
return nullptr;
}
void NzThreadImpl::Sleep(nzUInt32 time)
@@ -48,7 +47,7 @@ void NzThreadImpl::Sleep(nzUInt32 time)
// get the current time
timeval tv;
gettimeofday(&tv, NULL);
gettimeofday(&tv, nullptr);
// construct the time limit (current time + time to wait)
timespec ti;