diff --git a/thirdparty/chipmunk/include/chipmunk/chipmunk_structs.h b/thirdparty/chipmunk/include/chipmunk/chipmunk_structs.h
index d8b1e6ff22..1485795d4e 100644
--- a/thirdparty/chipmunk/include/chipmunk/chipmunk_structs.h
+++ b/thirdparty/chipmunk/include/chipmunk/chipmunk_structs.h
@@ -428,7 +428,7 @@ struct cpSpace {
 	cpArray *pooledArbiters;
 	
 	cpArray *allocatedBuffers;
-	unsigned int locked;
+	int locked;
 	
 	cpBool usesWildcards;
 	cpHashSet *collisionHandlers;
diff --git a/thirdparty/chipmunk/include/chipmunk/cpPolyline.h b/thirdparty/chipmunk/include/chipmunk/cpPolyline.h
index 4e878f0c90..9a6ebed3ca 100644
--- a/thirdparty/chipmunk/include/chipmunk/cpPolyline.h
+++ b/thirdparty/chipmunk/include/chipmunk/cpPolyline.h
@@ -23,7 +23,7 @@ CP_EXPORT cpPolyline *cpPolylineSimplifyCurves(cpPolyline *line, cpFloat tol);
 
 /**
 	Returns a copy of a polyline simplified by discarding "flat" vertexes.
-	This works well on straigt edged or angular shapes, not as well on smooth shapes.
+	This works well on straight edged or angular shapes, not as well on smooth shapes.
 */
 CP_EXPORT cpPolyline *cpPolylineSimplifyVertexes(cpPolyline *line, cpFloat tol);
 
diff --git a/thirdparty/chipmunk/src/cpPolyShape.c b/thirdparty/chipmunk/src/cpPolyShape.c
index 8fd45195ed..554a7f8f31 100644
--- a/thirdparty/chipmunk/src/cpPolyShape.c
+++ b/thirdparty/chipmunk/src/cpPolyShape.c
@@ -234,7 +234,7 @@ cpBoxShapeInit(cpPolyShape *poly, cpBody *body, cpFloat width, cpFloat height, c
 cpPolyShape *
 cpBoxShapeInit2(cpPolyShape *poly, cpBody *body, cpBB box, cpFloat radius)
 {
-	cpVect verts[] = {
+	cpVect verts[4] = {
 		cpv(box.r, box.b),
 		cpv(box.r, box.t),
 		cpv(box.l, box.t),
diff --git a/thirdparty/chipmunk/src/cpSpaceDebug.c b/thirdparty/chipmunk/src/cpSpaceDebug.c
index 4711ac5182..6b80894b0f 100644
--- a/thirdparty/chipmunk/src/cpSpaceDebug.c
+++ b/thirdparty/chipmunk/src/cpSpaceDebug.c
@@ -123,8 +123,6 @@ cpSpaceDebugDrawConstraint(cpConstraint *constraint, cpSpaceDebugDrawOptions *op
 		options->drawSegment(a, b, color, data);
 	} else if(cpConstraintIsDampedSpring(constraint)){
 		cpDampedSpring *spring = (cpDampedSpring *)constraint;
-		cpDataPointer data = options->data;
-		cpSpaceDebugColor color = options->constraintColor;
 		
 		cpVect a = cpTransformPoint(body_a->transform, spring->anchorA);
 		cpVect b = cpTransformPoint(body_b->transform, spring->anchorB);