From cabe6f1d65a84a6f047553eb5d859f407bff6a70 Mon Sep 17 00:00:00 2001
From: Perttu Ahola <celeron55@gmail.com>
Date: Fri, 11 Feb 2011 22:34:34 +0200
Subject: [PATCH] some fixes to make compiling on some bsd easier

---
 src/map.h     |  1 -
 src/porting.h | 11 +++++++++--
 src/socket.h  |  1 +
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/map.h b/src/map.h
index e93ba2c..60cfd69 100644
--- a/src/map.h
+++ b/src/map.h
@@ -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>
diff --git a/src/porting.h b/src/porting.h
index 441a57d..3133fcc 100644
--- a/src/porting.h
+++ b/src/porting.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
diff --git a/src/socket.h b/src/socket.h
index 6b7a246..c2b496e 100644
--- a/src/socket.h
+++ b/src/socket.h
@@ -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>