From 4033458aff500635a10c6659e6e1c6fe0db687e9 Mon Sep 17 00:00:00 2001 From: Simon Tatham Date: Sun, 7 Sep 2008 08:35:52 +0000 Subject: How did I manage to check this in without actually trying to build on Windows at all?! Fix some departures from the C standard, mostly declaring variables after a statement has already been issued in the same block. MSVC is picky about this where gcc is forgiving, and TBH I'd change the latter given the choice. [originally from svn r8166] --- grid.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'grid.c') diff --git a/grid.c b/grid.c index 7843111..0218b8b 100644 --- a/grid.c +++ b/grid.c @@ -81,8 +81,9 @@ static double point_line_distance(int px, int py, int bx, int by) { int det = ax*by - bx*ay + bx*py - px*by + px*ay - ax*py; + double len; det = max(det, -det); - double len = sqrt(SQ(ax - bx) + SQ(ay - by)); + len = sqrt(SQ(ax - bx) + SQ(ay - by)); return det / len; } @@ -136,9 +137,10 @@ grid_edge *grid_nearest_edge(grid *g, int x, int y) int j; if (!f) continue; for (j = 0; j < f->order; j++) { + int new_dist; grid_dot *d = f->dots[j]; if (d == cur) continue; - int new_dist = SQ(d->x - x) + SQ(d->y - y); + new_dist = SQ(d->x - x) + SQ(d->y - y); if (new_dist < dist) { new = d; break; /* found closer dot */ -- cgit v1.1