From f50cf5585acae10e0030589a5eb45e5f7fe66ea7 Mon Sep 17 00:00:00 2001
From: "erwin.coumans" <erwin.coumans@08e121b0-ae19-0410-a57b-3be3395fd4fd>
Date: Sun, 9 Sep 2012 22:19:54 +0000
Subject: [PATCH] fix MinGW compilation, use size_t instead of unsigned long
 add missing virtual methods in SequentialThreadSupport

---
 src/BulletMultiThreaded/SequentialThreadSupport.cpp | 12 ++++++++++++
 src/BulletMultiThreaded/SequentialThreadSupport.h   |  4 ++++
 src/BulletMultiThreaded/btThreadSupportInterface.h  |  2 +-
 src/MiniCL/MiniCL.cpp                               |  3 ++-
 4 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/BulletMultiThreaded/SequentialThreadSupport.cpp b/src/BulletMultiThreaded/SequentialThreadSupport.cpp
index 8cc72418f..199927721 100644
--- a/src/BulletMultiThreaded/SequentialThreadSupport.cpp
+++ b/src/BulletMultiThreaded/SequentialThreadSupport.cpp
@@ -165,5 +165,17 @@ btCriticalSection* SequentialThreadSupport::createCriticalSection()
 	
 }
 
+void SequentialThreadSupport::deleteBarrier(btBarrier* barrier)
+{
+    delete barrier;
+}
+
+void SequentialThreadSupport::deleteCriticalSection(btCriticalSection* criticalSection)
+{
+    delete criticalSection;
+}
+
+
+
 
 
diff --git a/src/BulletMultiThreaded/SequentialThreadSupport.h b/src/BulletMultiThreaded/SequentialThreadSupport.h
index 2b9ade82a..a188ef219 100644
--- a/src/BulletMultiThreaded/SequentialThreadSupport.h
+++ b/src/BulletMultiThreaded/SequentialThreadSupport.h
@@ -89,6 +89,10 @@ public:
 
 	virtual btCriticalSection* createCriticalSection();
 	
+    virtual void deleteBarrier(btBarrier* barrier);
+    
+    virtual void deleteCriticalSection(btCriticalSection* criticalSection);
+
 
 };
 
diff --git a/src/BulletMultiThreaded/btThreadSupportInterface.h b/src/BulletMultiThreaded/btThreadSupportInterface.h
index bbe7264bd..54f1769cf 100644
--- a/src/BulletMultiThreaded/btThreadSupportInterface.h
+++ b/src/BulletMultiThreaded/btThreadSupportInterface.h
@@ -79,7 +79,7 @@ public:
 
 	virtual void deleteBarrier(btBarrier* barrier)=0;
 
-        virtual void deleteCriticalSection(btCriticalSection* criticalSection)=0;
+    virtual void deleteCriticalSection(btCriticalSection* criticalSection)=0;
 	
 	virtual void*	getThreadLocalMemory(int taskId) { return 0; }
 
diff --git a/src/MiniCL/MiniCL.cpp b/src/MiniCL/MiniCL.cpp
index 52148dde0..ba0865aa7 100644
--- a/src/MiniCL/MiniCL.cpp
+++ b/src/MiniCL/MiniCL.cpp
@@ -32,6 +32,7 @@ subject to the following restrictions:
 #include "MiniCLTask/MiniCLTask.h"
 #include "LinearMath/btMinMax.h"
 #include <stdio.h>
+#include <stddef.h>
 
 //#define DEBUG_MINICL_KERNELS 1
 
@@ -478,7 +479,7 @@ static void* localBufMalloc(int size)
 	if((sLocalBufUsed + size16) > LOCAL_BUF_SIZE)
 	{ // reset
 		spLocalBufCurr = sLocalMemBuf;
-		while((unsigned long)spLocalBufCurr & 0x0F) spLocalBufCurr++; // align to 16 bytes
+		while((size_t)spLocalBufCurr & 0x0F) spLocalBufCurr++; // align to 16 bytes
 		sLocalBufUsed = 0;
 	}
 	void* ret = spLocalBufCurr;