aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/porting.h19
-rw-r--r--src/threading/thread.cpp2
2 files changed, 10 insertions, 11 deletions
diff --git a/src/porting.h b/src/porting.h
index 492c9d3a8..a4016e8d7 100644
--- a/src/porting.h
+++ b/src/porting.h
@@ -108,6 +108,15 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include <CoreFoundation/CoreFoundation.h>
#endif
+#ifndef _WIN32 // Posix
+ #include <sys/time.h>
+ #include <time.h>
+ #if defined(__MACH__) && defined(__APPLE__)
+ #include <mach/clock.h>
+ #include <mach/mach.h>
+ #endif
+#endif
+
namespace porting
{
@@ -158,10 +167,6 @@ void initIrrlicht(irr::IrrlichtDevice * );
Overflow can occur at any value higher than 10000000.
*/
#ifdef _WIN32 // Windows
-#ifndef _WIN32_WINNT
- #define _WIN32_WINNT 0x0501
-#endif
- #include <windows.h>
inline u32 getTimeS()
{
@@ -190,12 +195,6 @@ void initIrrlicht(irr::IrrlichtDevice * );
}
#else // Posix
-#include <sys/time.h>
-#include <time.h>
-#if defined(__MACH__) && defined(__APPLE__)
-#include <mach/clock.h>
-#include <mach/mach.h>
-#endif
inline u32 getTimeS()
{
diff --git a/src/threading/thread.cpp b/src/threading/thread.cpp
index a1cb720af..73a951194 100644
--- a/src/threading/thread.cpp
+++ b/src/threading/thread.cpp
@@ -80,7 +80,7 @@ DEALINGS IN THE SOFTWARE.
#include <sys/processor.h>
#elif defined(__APPLE__)
#include <mach/mach_init.h>
- #include <mach/thread_policy.h>
+ #include <mach/thread_act.h>
#endif