Minor fixes to keep trunk compiling, while doing the refactoring.

src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp

@@ -32,7 +32,7 @@ subject to the following restrictions:
 #include "btSolverBody.h"
 #include "btSolverConstraint.h"
 #include "LinearMath/btAlignedObjectArray.h"
-
+#include <string.h> //for memset
 
 btSequentialImpulseConstraintSolver::btSequentialImpulseConstraintSolver()
 :m_btSeed2(0)

src/BulletMultiThreaded/SpuSolverTask/SpuParallellSolverTask.cpp

@@ -1,3 +1,5 @@
+#ifdef CONSTRAINT_SOLVER_IS_BEING_REFACTORED_DURING_DECEMBER_2008
+
 /*
 Bullet Continuous Collision Detection and Physics Library - Parallel solver
 Copyright (c) 2007 Starbreeze Studios
@@ -1963,3 +1965,5 @@ void processSolverTask(void* userPtr, void* lsMemory)
 //		btAssert(0);
 	}
 }
+
+#endif //CONSTRAINT_SOLVER_IS_BEING_REFACTORED_DURING_DECEMBER_2008

src/BulletMultiThreaded/SpuSolverTask/SpuParallellSolverTask.h

@@ -1,3 +1,4 @@
+#ifdef CONSTRAINT_SOLVER_IS_BEING_REFACTORED_DURING_DECEMBER_2008
 /*
 Bullet Continuous Collision Detection and Physics Library - Parallel solver
 Copyright (c) 2007 Starbreeze Studios
@@ -248,3 +249,5 @@ inline bool constraintTypeSupported(btTypedConstraintType type)
 }
 
 #endif
+
+#endif //CONSTRAINT_SOLVER_IS_BEING_REFACTORED_DURING_DECEMBER_2008