aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans-Christoph Steiner <eighthave@users.sourceforge.net>2003-09-01 16:33:33 +0000
committerHans-Christoph Steiner <eighthave@users.sourceforge.net>2003-09-01 16:33:33 +0000
commite5333824d29ee2a92ec2c474bffe03d83dac8d73 (patch)
treec16749122e98efd3fc08831eca317171a3b93ebf
parent6600b6038fcfa9efcc071545aaf5bf5f7ebe6590 (diff)
fixed conflicting var names so that it compiles
svn path=/trunk/externals/unauthorized/; revision=921
-rw-r--r--grid/grid2.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/grid/grid2.c b/grid/grid2.c
index 924abd3..df53c5b 100644
--- a/grid/grid2.c
+++ b/grid/grid2.c
@@ -12,6 +12,9 @@
#include <stdio.h>
#include <math.h>
#include <ctype.h>
+
+#include <m_pd.h>
+
#include "m_imp.h"
#include "g_canvas.h"
#include "t_tk.h"
@@ -388,15 +391,15 @@ static void grid_motion(t_grid *x, t_floatarg dx, t_floatarg dy)
}
}
-static void grid_set(t_grid *x, t_floatarg x, t_floatarg y)
+static void grid_set(t_grid *x, t_floatarg dx, t_floatarg dy)
{
int xold = x->x_current;
int yold = x->y_current;
// post( "grid_set x=%f y=%f", x, y );
- x->x_current = x;
- x->y_current = y;
+ x->x_current = dx;
+ x->y_current = dy;
if(xold != x->x_current || yold != x->y_current)
{
grid_output_current(x);