* src/od.c (MIN, MAX): Remove definitions.

* src/sys2.h (MIN, MAX): Define here instead.

diff --git a/src/od.c b/src/od.c
index b6906f413c664f9b392e8f8e298ada823928b3c4..d72ffc11dd51b9f6aca5881c4fe7eb9913b86c6e 100644 (file)
--- a/src/od.c
+++ b/src/od.c
@@ -46,14 +46,6 @@ typedef double LONG_DOUBLE;
 # include <values.h>
 #endif
 
-#ifndef MAX
-# define MAX(a, b) ((a) > (b) ? (a) : (b))
-#endif
-
-#ifndef MIN
-# define MIN(a,b) (((a) < (b)) ? (a) : (b))
-#endif
-
 /* The default number of input bytes per output line.  */
 #define DEFAULT_BYTES_PER_BLOCK 16
 

diff --git a/src/sys2.h b/src/sys2.h
index b1d25f838404b9a7eed1236d46581bcd82872bdc..a58e948261fdc263fbd12327b1e0d77d8a60a8d0 100644 (file)
--- a/src/sys2.h
+++ b/src/sys2.h
@@ -274,3 +274,11 @@ char *base_name PARAMS ((char const *));
     close_stdout ();                                                   \
     exit (EXIT_SUCCESS);                                               \
     break;
+
+#ifndef MAX
+# define MAX(a, b) ((a) > (b) ? (a) : (b))
+#endif
+
+#ifndef MIN
+# define MIN(a,b) (((a) < (b)) ? (a) : (b))
+#endif