michael@0: diff --git a/gfx/skia/include/core/SkPostConfig.h b/gfx/skia/include/core/SkPostConfig.h
michael@0: --- a/gfx/skia/include/core/SkPostConfig.h
michael@0: +++ b/gfx/skia/include/core/SkPostConfig.h
michael@0: @@ -325,19 +325,19 @@
michael@0:              // Some documentation suggests we should be using __attribute__((override)),
michael@0:              // but it doesn't work.
michael@0:              #define SK_OVERRIDE override
michael@0:          #elif defined(__has_extension)
michael@0:              #if __has_extension(cxx_override_control)
michael@0:                  #define SK_OVERRIDE override
michael@0:              #endif
michael@0:          #endif
michael@0: -    #else
michael@0: -        // Linux GCC ignores "__attribute__((override))" and rejects "override".
michael@0: -        #define SK_OVERRIDE
michael@0: +    #endif
michael@0: +    #ifndef SK_OVERRIDE
michael@0: +	#define SK_OVERRIDE
michael@0:      #endif
michael@0:  #endif
michael@0:  
michael@0:  //////////////////////////////////////////////////////////////////////
michael@0:  
michael@0:  #ifndef SK_PRINTF_LIKE
michael@0:  #if defined(__clang__) || defined(__GNUC__)
michael@0:  #define SK_PRINTF_LIKE(A, B) __attribute__((format(printf, (A), (B))))