--- pnm/pnmtotiffcmyk.c.orig Fri Mar 24 09:17:16 2000 +++ pnm/pnmtotiffcmyk.c Sat Apr 1 12:00:00 2000 @@ -57,7 +57,7 @@ #include "pnm.h" #include -#ifdef __osf__ +#if defined(__osf__) || defined(__FreeBSD__) #include #endif #include @@ -69,7 +69,9 @@ #define VERSION 1.01 /* beware - these evaluate more than once */ +#undef MAX #define MAX(x, y) ( ( x ) > ( y ) ? ( x ) : ( y ) ) +#undef MIN #define MIN(x, y) ( ( x ) < ( y ) ? ( x ) : ( y ) ) /* only support 8 bit values */