--- a/liboctave/CMatrix.cc	Tue Aug 22 04:10:01 1995 +0000
+++ b/liboctave/CMatrix.cc	Tue Aug 22 05:41:48 1995 +0000
@@ -908,7 +908,7 @@
   for (int j = 0; j < nsamples; j++)
     F77_FCN (cfftb, CFFTB) (npts, &tmp_data[npts*j], wsave);
 
-  for (j = 0; j < npts*nsamples; j++)
+  for (int j = 0; j < npts*nsamples; j++)
     tmp_data[j] = tmp_data[j] / (double) npts;
 
   delete [] wsave;
@@ -952,14 +952,14 @@
 
   F77_FCN (cffti, CFFTI) (npts, wsave);
 
-  for (j = 0; j < nsamples; j++)
+  for (int j = 0; j < nsamples; j++)
     {
       for (int i = 0; i < npts; i++)
 	row[i] = tmp_data[i*nr + j];
 
       F77_FCN (cfftf, CFFTF) (npts, row, wsave);
 
-      for (i = 0; i < npts; i++)
+      for (int i = 0; i < npts; i++)
 	tmp_data[i*nr + j] = row[i];
     }
 
@@ -997,7 +997,7 @@
 
   delete [] wsave;
 
-  for (j = 0; j < npts*nsamples; j++)
+  for (int j = 0; j < npts*nsamples; j++)
     tmp_data[j] = tmp_data[j] / (double) npts;
 
   npts = nc;
@@ -1008,14 +1008,14 @@
 
   F77_FCN (cffti, CFFTI) (npts, wsave);
 
-  for (j = 0; j < nsamples; j++)
+  for (int j = 0; j < nsamples; j++)
     {
       for (int i = 0; i < npts; i++)
 	row[i] = tmp_data[i*nr + j];
 
       F77_FCN (cfftb, CFFTB) (npts, row, wsave);
 
-      for (i = 0; i < npts; i++)
+      for (int i = 0; i < npts; i++)
 	tmp_data[i*nr + j] = row[i] / (double) npts;
     }
 
@@ -1263,9 +1263,8 @@
   int nrr = m > n ? m : n;
   ComplexMatrix result (nrr, nrhs);
 
-  int i, j;
-  for (j = 0; j < nrhs; j++)
-    for (i = 0; i < m; i++)
+  for (int j = 0; j < nrhs; j++)
+    for (int i = 0; i < m; i++)
       result.elem (i, j) = b.elem (i, j);
 
   Complex *presult = result.fortran_vec ();
@@ -1289,8 +1288,8 @@
 			    rcond, rank, work, lwork, rwork, info);
 
   ComplexMatrix retval (n, nrhs);
-  for (j = 0; j < nrhs; j++)
-    for (i = 0; i < n; i++)
+  for (int j = 0; j < nrhs; j++)
+    for (int i = 0; i < n; i++)
       retval.elem (i, j) = result.elem (i, j);
 
   delete [] tmp_data;
@@ -1337,8 +1336,7 @@
   int nrr = m > n ? m : n;
   ComplexColumnVector result (nrr);
 
-  int i;
-  for (i = 0; i < m; i++)
+  for (int i = 0; i < m; i++)
     result.elem (i) = b.elem (i);
 
   Complex *presult = result.fortran_vec ();
@@ -1362,7 +1360,7 @@
 			    rcond, rank, work, lwork, rwork, info);
 
   ComplexColumnVector retval (n);
-  for (i = 0; i < n; i++)
+  for (int i = 0; i < n; i++)
     retval.elem (i) = result.elem (i);
 
   delete [] tmp_data;