fix Mac OSX build

Demos/Benchmarks/BenchmarkDemo.cpp

@@ -1257,7 +1257,7 @@ btRigidBody*	DemoApplication::localCreateRigidBody(float mass, const btTransform
 
 	btRigidBody* body = new btRigidBody(mass,0,shape,localInertia);	
 	body->setWorldTransform(startTransform);
-
+	body->setContactProcessingThreshold(m_defaultContactProcessingThreshold);
 	m_dynamicsWorld->addRigidBody(body);
 
 	return body;

Demos/Benchmarks/BenchmarkDemo.h

@@ -40,7 +40,13 @@ class DemoApplication
 protected:
 
 	btDynamicsWorld* m_dynamicsWorld;
+	btScalar	m_defaultContactProcessingThreshold;
+
 public:
+	DemoApplication()
+	:m_defaultContactProcessingThreshold(BT_LARGE_FLOAT)
+	{
+	}
 	virtual void myinit() {}
 	virtual btDynamicsWorld* getDynamicsWorld()
 	{

Demos/Benchmarks/main.cpp

@@ -51,7 +51,9 @@ int main(int argc,char** argv)
 	benchmarkDemo.initPhysics();
 	benchmarkDemo.getDynamicsWorld()->setDebugDrawer(&gDebugDrawer);
 	benchmarkDemo.setDebugMode(benchmarkDemo.getDebugMode() | btIDebugDraw::DBG_NoDeactivation);
+	setDefaultContactProcessingThreshold(0.f);
 	return glutmain(argc, argv,640,480,"Bullet Physics Demo. http://bulletphysics.com",&benchmarkDemo);
+
 #else //USE_GRAPHICAL_BENCHMARK
 	int d;
 

src/MiniCL/cl_MiniCL_Defs.h

@@ -260,4 +260,6 @@ static uint4 operator-(const uint4& a,const uint4& b)
 #define as_int(a) (*((int*)&(a)))
 
 extern "C" int gMiniCLNumOutstandingTasks;
-//	extern "C" void __kernel_func();											\
+//	extern "C" void __kernel_func();
+
+

src/MiniCL/cl_platform.h

@@ -31,7 +31,7 @@ struct MiniCLKernelDesc
 	MiniCLKernelDesc(void* pCode, char* pName);
 };
 
-#define MINICL_REGISTER(__kernel_func) static MiniCLKernelDesc __kernel_func##Desc(__kernel_func, #__kernel_func);
+#define MINICL_REGISTER(__kernel_func) static MiniCLKernelDesc __kernel_func##Desc((void*)__kernel_func, #__kernel_func);
 
 
 #ifdef __APPLE__