From d82c4bed75ddd05dfd23b2ee81b53274031d262e Mon Sep 17 00:00:00 2001 From: Xiaosong Gao Date: Fri, 11 Apr 2014 08:07:18 +0800 Subject: [PATCH] In Mac OS X 10.9 and Xcode 5.1, it is a warning "Declaration shadows a local variable" in a new ios/mac project. --- external/chipmunk/src/cpCollision.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/external/chipmunk/src/cpCollision.c b/external/chipmunk/src/cpCollision.c index 3474dc6700..3b3e4e1138 100644 --- a/external/chipmunk/src/cpCollision.c +++ b/external/chipmunk/src/cpCollision.c @@ -241,9 +241,9 @@ ClosestPointsNew(const struct MinkowskiPoint v0, const struct MinkowskiPoint v1) return points; } else { cpFloat d2 = cpvlength(p); - cpVect n = cpvmult(p, 1.0f/(d2 + CPFLOAT_MIN)); + cpVect n2 = cpvmult(p, 1.0f/(d2 + CPFLOAT_MIN)); - struct ClosestPoints points = {pa, pb, n, d2, id}; + struct ClosestPoints points = {pa, pb, n2, d2, id}; return points; } }