BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Fix building on OSX, broken since "Clean up threading"

Browse Source 
Commit

e4bff8be94c0db4f94e63ad448d0eeb869ccdbbd - Clean up threading

by @ShadowNinja has broken the OSX build.

Including things inside a namespace isn't good.

Also fixes #3124.
This commit is contained in:
Pavel Puchkin 2015-08-27 20:51:07 +02:00 committed by est31
parent 91bf68e1fe
commit 588f0c1fb0
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/porting.h
View File

@ -108,6 +108,15 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include <CoreFoundation/CoreFoundation.h> #include <CoreFoundation/CoreFoundation.h>
#endif #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 namespace porting
{ {
@ -158,10 +167,6 @@ void initIrrlicht(irr::IrrlichtDevice * );
Overflow can occur at any value higher than 10000000. Overflow can occur at any value higher than 10000000.
*/ */
#ifdef _WIN32 // Windows #ifdef _WIN32 // Windows
#ifndef _WIN32_WINNT
#define _WIN32_WINNT 0x0501
#endif
#include <windows.h>
inline u32 getTimeS() inline u32 getTimeS()
{ {
@ -190,12 +195,6 @@ void initIrrlicht(irr::IrrlichtDevice * );
} }
#else // Posix #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() inline u32 getTimeS()
{ {

2
src/threading/thread.cpp
View File

@ -80,7 +80,7 @@ DEALINGS IN THE SOFTWARE.
#include <sys/processor.h> #include <sys/processor.h>
#elif defined(__APPLE__) #elif defined(__APPLE__)
#include <mach/mach_init.h> #include <mach/mach_init.h>
#include <mach/thread_policy.h> #include <mach/thread_act.h>
#endif #endif