mirror of
https://github.com/minetest/minetest.git
synced 2024-08-19 04:54:18 +02:00
some fixes to make compiling on some bsd easier
This commit is contained in:
parent
dad2455a03
commit
cabe6f1d65
@ -23,7 +23,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
#include <jmutex.h>
|
||||
#include <jthread.h>
|
||||
#include <iostream>
|
||||
#include <malloc.h>
|
||||
|
||||
#ifdef _WIN32
|
||||
#include <windows.h>
|
||||
|
@ -86,13 +86,20 @@ void initializePaths();
|
||||
return GetTickCount();
|
||||
}
|
||||
#else // Posix
|
||||
#include <sys/timeb.h>
|
||||
#include <sys/time.h>
|
||||
inline u32 getTimeMs()
|
||||
{
|
||||
struct timeval tv;
|
||||
gettimeofday(&tv, NULL);
|
||||
return tv.tv_sec * 1000 + tv.tv_usec / 1000;
|
||||
}
|
||||
/*#include <sys/timeb.h>
|
||||
inline u32 getTimeMs()
|
||||
{
|
||||
struct timeb tb;
|
||||
ftime(&tb);
|
||||
return tb.time * 1000 + tb.millitm;
|
||||
}
|
||||
}*/
|
||||
#endif
|
||||
|
||||
} // namespace porting
|
||||
|
@ -35,6 +35,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
typedef SOCKET socket_t;
|
||||
typedef int socklen_t;
|
||||
#else
|
||||
#include <sys/types.h>
|
||||
#include <sys/socket.h>
|
||||
#include <netinet/in.h>
|
||||
#include <fcntl.h>
|
||||
|
Loading…
Reference in New Issue
Block a user