From cd812c10d8fd21da992ad864ec2cb980c960ffff Mon Sep 17 00:00:00 2001 From: "sfraser%netscape.com" Date: Wed, 23 Feb 2000 23:10:38 +0000 Subject: [PATCH] Changes for Mac to make cartman build (bug 19119). r=mwelch, a=jar git-svn-id: svn://10.0.0.236/trunk@61534 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/include/xp_core.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mozilla/include/xp_core.h b/mozilla/include/xp_core.h index 70430f9a548..87f2c396653 100644 --- a/mozilla/include/xp_core.h +++ b/mozilla/include/xp_core.h @@ -186,7 +186,7 @@ #endif /* this should just go away, as nspr has it. */ -#if !defined(XP_WIN) && !defined(XP_UNIX) && !defined(XP_OS2) +#if !defined(XP_WIN) && !defined(XP_UNIX) && !defined(XP_OS2) && !defined(XP_MAC) typedef int (*FARPROC)(); #endif @@ -203,8 +203,9 @@ typedef int (*FARPROC)(); #endif #endif -#if defined(XP_UNIX) && !defined(MIN) +#if (defined(XP_UNIX) || defined(XP_MAC)) && !defined(MIN) #define MIN(a,b) (((a)<(b))?(a):(b)) +#define MAX(a,b) (((a)>(b))?(a):(b)) #endif #ifndef FALSE