Merge branch 'master' of https://github.com/Gawaboumga/NazaraEngine into Gawaboumga-master

Former-commit-id: 56e40c1b251e01c435595ac73a696d2720fb1453
2014-06-15 01:20:46 +02:00
parent f55b151c8e 676ed6c9d8
commit 62daced765
13 changed files with 141 additions and 44 deletions
--- a/src/Nazara/Core/Win32/TaskSchedulerImpl.cpp
+++ b/src/Nazara/Core/Win32/TaskSchedulerImpl.cpp
@@ -4,9 +4,10 @@

 #include <Nazara/Core/Win32/TaskSchedulerImpl.hpp>
 #include <Nazara/Core/Config.hpp>
-#include <Nazara/Core/Error.hpp>
-#include <process.h>
 #include <Nazara/Core/Debug.hpp>
+#include <Nazara/Core/Error.hpp>
+#include <cstdlib>
+#include <process.h>

 bool NzTaskSchedulerImpl::Initialize(unsigned int workerCount)
 {