From 9cbcfa3821bdce45c5bdc7b80694074721ac9397 Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Fri, 19 Oct 2001 00:00:36 +0000 Subject: [PATCH] Changed __ENV_LINUX__ to __linux__, conditionalized min,max macros --- include/pstypes.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/include/pstypes.h b/include/pstypes.h index d21722b8..d29b05ba 100644 --- a/include/pstypes.h +++ b/include/pstypes.h @@ -22,20 +22,24 @@ typedef signed char byte; //define unsigned types; typedef unsigned char ubyte; -#ifndef __ENV_LINUX__ +#ifndef __linux__ typedef unsigned short ushort; typedef unsigned int uint; typedef unsigned long ulong; #endif -# define min(a,b) (((a)>(b))?(b):(a)) -# define max(a,b) (((a)<(b))?(b):(a)) +#ifndef min +#define min(a,b) (((a)>(b))?(b):(a)) +#endif +#ifndef max +#define max(a,b) (((a)<(b))?(b):(a)) +#endif #if defined __MINGW32__ #include typedef uint32_t u_int32_t; -#elif defined __ENV_LINUX__ +#elif defined __linux__ # include # define _MAX_PATH 1024 # define _MAX_DIR 256 -- 2.39.2