defines for malloc() and realloc()

conditional defines for abs(), min(), and max()

diff --git a/flexdef.h b/flexdef.h
index 9df78998990b50614a1e4d6bc7e16a9806b10f46..4146fe6217f6524af71b8be881d1d2bb9babee61 100644 (file)
--- a/flexdef.h
+++ b/flexdef.h
@@ -52,7 +52,9 @@
 
 #ifdef AMIGA
 #define bzero(s, n) setmem((char *)(s), n, '\0')
+#ifndef abs
 #define abs(x) ((x) < 0 ? -(x) : (x))
+#endif
 #else
 #define bzero(s, n) memset((char *)(s), '\0', n)
 #endif
@@ -83,6 +85,8 @@ char *sprintf(); /* keep lint happy */
 #endif
 #endif
 
+char *malloc(), *realloc();
+
 
 /* maximum line length we'll have to deal with */
 #define MAXLINE BUFSIZ
@@ -90,11 +94,17 @@ char *sprintf(); /* keep lint happy */
 /* maximum size of file name */
 #define FILENAMESIZE 1024
 
+#ifndef min
 #define min(x,y) ((x) < (y) ? (x) : (y))
+#endif
+#ifndef max
 #define max(x,y) ((x) > (y) ? (x) : (y))
+#endif
 
 #ifdef MS_DOS
+#ifndef abs
 #define abs(x) ((x) < 0 ? -(x) : (x))
+#endif
 #define SHORT_FILE_NAMES
 #endif