From: Jim Meyering Date: Tue, 13 Apr 1999 01:09:15 +0000 (+0000) Subject: * src/od.c (MIN, MAX): Remove definitions. X-Git-Tag: TEXTUTILS-1_22j~50 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b6d265e347a53be00d84f23c236e424b3620ba10;p=thirdparty%2Fcoreutils.git * 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 b6906f413c..d72ffc11dd 100644 --- a/src/od.c +++ b/src/od.c @@ -46,14 +46,6 @@ typedef double LONG_DOUBLE; # include #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 b1d25f8384..a58e948261 100644 --- 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