Fix the merge conflict of bug 958596 and bug 978776

This commit is contained in:
Ehsan Akhgari 2014-03-03 18:24:04 -05:00
parent c9aa332116
commit 780631919e

View File

@ -246,7 +246,7 @@ struct GradientStop
}
}
#if defined(XP_WIN) && defined(GKMEDIAS_SHARED_LIBRARY)
#if defined(XP_WIN) && defined(MOZ_GFX)
#ifdef GFX2D_INTERNAL
#define GFX2D_API __declspec(dllexport)
#else