Bug 547964 - r=dbaron

--HG--
extra : rebase_source : 88834502ab1cdac1aa7dac9557ee1aa40ccc354f
This commit is contained in:
Julian Seward 2010-04-12 11:53:59 -04:00
parent b1eaf1cf2d
commit 4a8eff8ae8
2 changed files with 15 additions and 2 deletions

View File

@ -97,6 +97,13 @@
#include "nsIDOMSVGTransformable.h" #include "nsIDOMSVGTransformable.h"
#endif // MOZ_SMIL #endif // MOZ_SMIL
// This is needed to ensure correct handling of calls to the
// vararg-list methods in this file:
// nsSVGElement::GetAnimated{Length,Number,Integer}Values
// See bug 547964 for details:
PR_STATIC_ASSERT(sizeof(void*) == sizeof(nsnull));
nsSVGEnumMapping nsSVGElement::sSVGUnitTypesMap[] = { nsSVGEnumMapping nsSVGElement::sSVGUnitTypesMap[] = {
{&nsGkAtoms::userSpaceOnUse, nsIDOMSVGUnitTypes::SVG_UNIT_TYPE_USERSPACEONUSE}, {&nsGkAtoms::userSpaceOnUse, nsIDOMSVGUnitTypes::SVG_UNIT_TYPE_USERSPACEONUSE},
{&nsGkAtoms::objectBoundingBox, nsIDOMSVGUnitTypes::SVG_UNIT_TYPE_OBJECTBOUNDINGBOX}, {&nsGkAtoms::objectBoundingBox, nsIDOMSVGUnitTypes::SVG_UNIT_TYPE_OBJECTBOUNDINGBOX},

View File

@ -369,9 +369,15 @@ typedef PRUint32 nsrefcnt;
#endif #endif
/** /**
* The preferred symbol for null. * The preferred symbol for null. Make sure this is the same size as
* void* on the target. See bug 547964.
*/ */
#define nsnull 0 #if defined(_WIN64)
# define nsnull 0LL
#else
# define nsnull 0L
#endif
#include "nsError.h" #include "nsError.h"