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
This commit is contained in:
parent
b1f338db70
commit
bb81de2d15
@ -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);
|
||||
|
||||
@ -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);
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user