From bb81de2d15516d2782a135bbb4e373a3afe7de62 Mon Sep 17 00:00:00 2001 From: "seawood%netscape.com" Date: Fri, 11 Oct 2002 22:31:43 +0000 Subject: [PATCH] mach-o builds define both XP_UNIX *and* XP_MACOSX so we need to add a !XP_MACOSX to the XP_UNIX ifdef to avoid repeating a chunk of code twice and crashing. Bug #173695 r=pavlov sr=alecf a=tor git-svn-id: svn://10.0.0.236/trunk@131833 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/generic/nsFrame.cpp | 2 +- mozilla/layout/html/base/src/nsFrame.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mozilla/layout/generic/nsFrame.cpp b/mozilla/layout/generic/nsFrame.cpp index ad4306a06e7..467c60cb724 100644 --- a/mozilla/layout/generic/nsFrame.cpp +++ b/mozilla/layout/generic/nsFrame.cpp @@ -357,7 +357,7 @@ SelectionImageService::CreateImage(nscolor aImageColor, imgIContainer *aContaine *data++ = NS_GET_G(aImageColor); *data++ = NS_GET_R(aImageColor); #endif -#ifdef XP_UNIX +#if defined(XP_UNIX) && !defined(XP_MACOSX) *data++ = NS_GET_R(aImageColor); *data++ = NS_GET_G(aImageColor); *data++ = NS_GET_B(aImageColor); diff --git a/mozilla/layout/html/base/src/nsFrame.cpp b/mozilla/layout/html/base/src/nsFrame.cpp index ad4306a06e7..467c60cb724 100644 --- a/mozilla/layout/html/base/src/nsFrame.cpp +++ b/mozilla/layout/html/base/src/nsFrame.cpp @@ -357,7 +357,7 @@ SelectionImageService::CreateImage(nscolor aImageColor, imgIContainer *aContaine *data++ = NS_GET_G(aImageColor); *data++ = NS_GET_R(aImageColor); #endif -#ifdef XP_UNIX +#if defined(XP_UNIX) && !defined(XP_MACOSX) *data++ = NS_GET_R(aImageColor); *data++ = NS_GET_G(aImageColor); *data++ = NS_GET_B(aImageColor);