mirror of
https://github.com/minetest/minetest.git
synced 2024-09-20 19:40:18 +02:00
Porting: include system headers outside namespace block
We might end up with unexpected results if we include system headers within a namespace {} block. This fixes issue #3124 compile error with curl enabled on musl libc.
This commit is contained in:
parent
196975ba5c
commit
01a1a6120c
|
@ -59,6 +59,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
||||||
#else
|
#else
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <stdint.h> //for uintptr_t
|
#include <stdint.h> //for uintptr_t
|
||||||
|
#include <sys/time.h>
|
||||||
|
#include <time.h>
|
||||||
|
#if defined(__MACH__) && defined(__APPLE__)
|
||||||
|
#include <mach/clock.h>
|
||||||
|
#include <mach/mach.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#if (defined(linux) || defined(__linux) || defined(__GNU__)) && !defined(_GNU_SOURCE)
|
#if (defined(linux) || defined(__linux) || defined(__GNU__)) && !defined(_GNU_SOURCE)
|
||||||
#define _GNU_SOURCE
|
#define _GNU_SOURCE
|
||||||
|
@ -161,8 +167,6 @@ void initIrrlicht(irr::IrrlichtDevice * );
|
||||||
#ifndef _WIN32_WINNT
|
#ifndef _WIN32_WINNT
|
||||||
#define _WIN32_WINNT 0x0501
|
#define _WIN32_WINNT 0x0501
|
||||||
#endif
|
#endif
|
||||||
#include <windows.h>
|
|
||||||
|
|
||||||
inline u32 getTimeS()
|
inline u32 getTimeS()
|
||||||
{
|
{
|
||||||
return GetTickCount() / 1000;
|
return GetTickCount() / 1000;
|
||||||
|
@ -190,13 +194,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()
|
||||||
{
|
{
|
||||||
struct timeval tv;
|
struct timeval tv;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user