code cleanup

svn path=/trunk/externals/ann/; revision=2737

2 files changed, 5 insertions, 5 deletions

diff --git a/src/ann.c b/src/ann.c
index 8b0cb27..ca1b69c 100644
--- a/src/ann.c
+++ b/src/ann.c
@@ -31,7 +31,7 @@ void *ann_new(void)
   return (void *)x;
 }
 
-void ann_som_setup();
+void ann_som_setup(void);
 
 /*
   waiting to be released in near future:
diff --git a/src/ann_som.c b/src/ann_som.c
index 8bec93c..f1da9fc 100644
--- a/src/ann_som.c
+++ b/src/ann_som.c
@@ -105,12 +105,12 @@ static void som_makedist(t_som *x)
   x->dist = (t_float **)getbytes(x->num_neurons * sizeof(t_float *));
 
   for (i=0; i<x->num_neurons; i++) {
-    int x1 = (i%x->num_neurX), y1 = (i/x->num_neurX);
+    int X1 = (i%x->num_neurX), Y1 = (i/x->num_neurX);
     x->dist[i]=(t_float *)getbytes(x->num_neurons * sizeof(t_float));
 
     for (j=0; j<x->num_neurons; j++) {
-      int x2 = (j%x->num_neurX), y2 = (j/x->num_neurX);
-      x->dist[i][j] = sqrt((x1-x2)*(x1-x2)+(y1-y2)*(y1-y2));
+      int X2 = (j%x->num_neurX), Y2 = (j/x->num_neurX);
+      x->dist[i][j] = sqrt((X1-X2)*(X1-X2)+(Y1-Y2)*(Y1-Y2));
     }
   }
 }
@@ -179,7 +179,7 @@ static void som_createnewsom(t_som *x, int sens, int nx, int ny)
 
 /* ----------------- public functions ---------------------- */
 
-static void som_list(t_som *x, t_symbol *s, int argc, t_atom *argv)
+static void som_list(t_som *x, t_symbol *sl, int argc, t_atom *argv)
 { /* present the data */
   int i = x->num_sensors;
   //  t_float *data = (t_float *)getbytes(sizeof(t_float) * i);