4 files changed, 131 insertions, 14 deletions
diff --git a/drivers/unix/ip_unix.cpp b/drivers/unix/ip_unix.cpp
index 0ebd593953..ffb37b4f59 100644
--- a/drivers/unix/ip_unix.cpp
+++ b/drivers/unix/ip_unix.cpp
@@ -37,19 +37,25 @@
   #ifndef AI_ADDRCONFIG
     #define AI_ADDRCONFIG 0x00000400
   #endif
- #ifdef UWP_ENABLED
   #include <ws2tcpip.h>
   #include <winsock2.h>
   #include <windows.h>
   #include <stdio.h>
- #else
-  #define WINVER 0x0600
-  #include <ws2tcpip.h>
-  #include <winsock2.h>
-  #include <windows.h>
-  #include <stdio.h>
-  #include <iphlpapi.h>
- #endif
+  #ifndef UWP_ENABLED
+    #if defined(__MINGW32__ ) && (!defined(__MINGW64_VERSION_MAJOR) || __MINGW64_VERSION_MAJOR < 4)
+      // MinGW-w64 on Ubuntu 12.04 (our Travis build env) has bugs in this code where
+      // some includes are missing in dependencies of iphlpapi.h for WINVER >= 0x0600 (Vista).
+      // We don't use this Vista code for now, so working it around by disabling it.
+      // MinGW-w64 >= 4.0 seems to be better judging by its headers.
+      #undef _WIN32_WINNT
+      #define _WIN32_WINNT 0x0501 // Windows XP, disable Vista API
+      #include <iphlpapi.h>
+      #undef _WIN32_WINNT
+      #define _WIN32_WINNT 0x0600 // Reenable Vista API
+    #else
+      #include <iphlpapi.h>
+    #endif // MINGW hack
+  #endif
 #else
  #include <netdb.h>
  #ifdef ANDROID_ENABLED
diff --git a/drivers/unix/os_unix.cpp b/drivers/unix/os_unix.cpp
index 1e8b76f505..283cff0486 100644
--- a/drivers/unix/os_unix.cpp
+++ b/drivers/unix/os_unix.cpp
@@ -31,10 +31,10 @@
 #ifdef UNIX_ENABLED
 
 
-#include "os/memory_pool_dynamic_static.h"
 #include "thread_posix.h"
 #include "semaphore_posix.h"
 #include "mutex_posix.h"
+#include "rw_lock_posix.h"
 #include "core/os/thread_dummy.h"
 
 //#include "core/io/file_access_buffered_fa.h"
@@ -116,7 +116,6 @@ int OS_Unix::unix_initialize_audio(int p_audio_driver) {
 	return 0;
 }
 	
-static MemoryPoolDynamicStatic *mempool_dynamic=NULL;
 	
 	
 void OS_Unix::initialize_core() {
@@ -129,6 +128,7 @@ void OS_Unix::initialize_core() {
 	ThreadPosix::make_default();	
 	SemaphorePosix::make_default();
 	MutexPosix::make_default();	
+	RWLockPosix::make_default();
 #endif
 	FileAccess::make_default<FileAccessUnix>(FileAccess::ACCESS_RESOURCES);
 	FileAccess::make_default<FileAccessUnix>(FileAccess::ACCESS_USERDATA);
@@ -144,7 +144,6 @@ void OS_Unix::initialize_core() {
 	PacketPeerUDPPosix::make_default();
 	IP_Unix::make_default();
 #endif
-	mempool_dynamic = memnew( MemoryPoolDynamicStatic );
 
 	ticks_start=0;
 	ticks_start=get_ticks_usec();
@@ -153,8 +152,6 @@ void OS_Unix::initialize_core() {
 void OS_Unix::finalize_core() {
 
 
-	if (mempool_dynamic)
-		memdelete( mempool_dynamic );
 
 }
 
diff --git a/drivers/unix/rw_lock_posix.cpp b/drivers/unix/rw_lock_posix.cpp
new file mode 100644
index 0000000000..b51e5fd420
--- /dev/null
+++ b/drivers/unix/rw_lock_posix.cpp
@@ -0,0 +1,77 @@
+
+#if defined(UNIX_ENABLED) || defined(PTHREAD_ENABLED)
+
+#include "os/memory.h"
+#include "rw_lock_posix.h"
+#include "error_macros.h"
+#include <stdio.h>
+
+void RWLockPosix::read_lock() {
+
+	int err =pthread_rwlock_rdlock(&rwlock);
+	if (err!=0) {
+		perror("wtf: ");
+	}
+	ERR_FAIL_COND(err!=0);
+}
+
+void RWLockPosix::read_unlock() {
+
+	pthread_rwlock_unlock(&rwlock);
+}
+
+Error RWLockPosix::read_try_lock() {
+
+	if (pthread_rwlock_tryrdlock(&rwlock)!=0) {
+		return ERR_BUSY;
+	} else {
+		return OK;
+	}
+
+}
+
+void RWLockPosix::write_lock() {
+
+	int err = pthread_rwlock_wrlock(&rwlock);
+	ERR_FAIL_COND(err!=0);
+}
+
+void RWLockPosix::write_unlock() {
+
+	pthread_rwlock_unlock(&rwlock);
+}
+
+Error RWLockPosix::write_try_lock() {
+	if (pthread_rwlock_trywrlock(&rwlock)!=0) {
+		return ERR_BUSY;
+	} else {
+		return OK;
+	}
+}
+
+
+RWLock *RWLockPosix::create_func_posix() {
+
+	return memnew( RWLockPosix );
+}
+
+void RWLockPosix::make_default() {
+
+	create_func=create_func_posix;
+}
+
+
+RWLockPosix::RWLockPosix() {
+
+	//rwlock=PTHREAD_RWLOCK_INITIALIZER; fails on OSX
+	pthread_rwlock_init(&rwlock,NULL);
+}
+
+
+RWLockPosix::~RWLockPosix() {
+
+	pthread_rwlock_destroy(&rwlock);
+
+}
+
+#endif
diff --git a/drivers/unix/rw_lock_posix.h b/drivers/unix/rw_lock_posix.h
new file mode 100644
index 0000000000..bcc102f6a6
--- /dev/null
+++ b/drivers/unix/rw_lock_posix.h
@@ -0,0 +1,37 @@
+#ifndef RWLOCKPOSIX_H
+#define RWLOCKPOSIX_H
+
+#if defined(UNIX_ENABLED) || defined(PTHREAD_ENABLED)
+
+#include <pthread.h>
+#include "os/rw_lock.h"
+
+class RWLockPosix : public RWLock {
+
+
+	pthread_rwlock_t rwlock;
+
+	static RWLock *create_func_posix();
+
+public:
+
+	virtual void read_lock();
+	virtual void read_unlock();
+	virtual Error read_try_lock();
+
+	virtual void write_lock();
+	virtual void write_unlock();
+	virtual Error write_try_lock();
+
+	static void make_default();
+
+	RWLockPosix();
+
+	~RWLockPosix();
+
+};
+
+#endif
+
+
+#endif // RWLOCKPOSIX_H