--- a/src/data.cc	Wed Jul 30 19:15:31 2003 +0000
+++ b/src/data.cc	Wed Jul 30 20:03:11 2003 +0000
@@ -42,14 +42,6 @@
 #include "oct-obj.h"
 #include "utils.h"
 
-#ifndef MIN
-#define MIN(a,b) ((a) < (b) ? (a) : (b))
-#endif
-
-#ifndef ABS
-#define ABS(x) (((x) < 0) ? (-x) : (x))
-#endif
-
 #define ANY_ALL(FCN) \
  \
   octave_value retval; \
@@ -454,7 +446,7 @@
 
   if (nr == 1)
     {
-      int n = nc + ABS (k);
+      int n = nc + std::abs (k);
       Matrix m (n, n, 0.0);
       for (int i = 0; i < nc; i++)
 	m (i+roff, i+coff) = v (0, i);
@@ -462,7 +454,7 @@
     }
   else
     {
-      int n = nr + ABS (k);
+      int n = nr + std::abs (k);
       Matrix m (n, n, 0.0);
       for (int i = 0; i < nr; i++)
 	m (i+roff, i+coff) = v (i, 0);
@@ -496,7 +488,7 @@
 
   if (nr == 1)
     {
-      int n = nc + ABS (k);
+      int n = nc + std::abs (k);
       ComplexMatrix m (n, n, 0.0);
       for (int i = 0; i < nc; i++)
 	m (i+roff, i+coff) = v (0, i);
@@ -504,7 +496,7 @@
     }
   else
     {
-      int n = nr + ABS (k);
+      int n = nr + std::abs (k);
       ComplexMatrix m (n, n, 0.0);
       for (int i = 0; i < nr; i++)
 	m (i+roff, i+coff) = v (i, 0);