0033-Bug-974900-undef-interface-windows.patch (815B)
1 # HG changeset patch 2 # Parent b12f9a408740aa5fd93c296a7d41e1b5f54c1b20 3 Bug 974900 - #undef interface defined by windows headers - r=gw280 4 5 diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLCaps.h b/gfx/skia/trunk/src/gpu/gl/GrGLCaps.h 6 --- a/gfx/skia/trunk/src/gpu/gl/GrGLCaps.h 7 +++ b/gfx/skia/trunk/src/gpu/gl/GrGLCaps.h 8 @@ -9,16 +9,19 @@ 9 #ifndef GrGLCaps_DEFINED 10 #define GrGLCaps_DEFINED 11 12 #include "GrDrawTargetCaps.h" 13 #include "GrGLStencilBuffer.h" 14 #include "SkTArray.h" 15 #include "SkTDArray.h" 16 17 +// defined in Windows headers 18 +#undef interface 19 + 20 class GrGLContextInfo; 21 22 /** 23 * Stores some capabilities of a GL context. Most are determined by the GL 24 * version and the extensions string. It also tracks formats that have passed 25 * the FBO completeness test. 26 */ 27 class GrGLCaps : public GrDrawTargetCaps {