X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=include%2Fkstddef.h;h=5634ef9862be74f2be521f27e95803feb6b5408d;hb=0ed0b45e2292346f54ea196825135ccc35536bfe;hp=3ad537aa8c843d48b1071c24675afdf49c14729b;hpb=d46f5229565d6fdd6c3d164ee0790433ff9118a2;p=ctsim.git

diff --git a/include/kstddef.h b/include/kstddef.h
index 3ad537a..5634ef9 100644
--- a/include/kstddef.h
+++ b/include/kstddef.h
@@ -2,8 +2,11 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: kstddef.h,v 1.5 2000/05/02 20:00:25 kevin Exp $
+**  $Id: kstddef.h,v 1.6 2000/05/03 19:51:41 kevin Exp $
 **  $Log: kstddef.h,v $
+**  Revision 1.6  2000/05/03 19:51:41  kevin
+**  function renaming for phantoms and phantom elements
+**
 **  Revision 1.5  2000/05/02 20:00:25  kevin
 **  *** empty log message ***
 **
@@ -107,8 +110,12 @@ typedef unsigned char string[STR_SIZE];
 #define ABS(x)    ((x) < 0 ? -(x) : (x))
 #define SQR(x)    ((x) * (x))
 
+#ifndef MAX
 #define MAX(a,b)  ((a) > (b) ? (a) : (b))
+#endif
+#ifndef MIN
 #define MIN(a,b)  ((a) <= (b) ? (a) : (b))
+#endif
 #define ISWAP(a,b) {int i; i = a; a = b; b = i;}
 
 #define CLIP(n,lb,ub)	if (n < lb) n = lb; else if (n > ub) n = ub