From 79a6a76cb177880c374de80d0b600c231856dbb4 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Fri, 13 Jun 2014 11:34:07 -0400
Subject: [PATCH] Bug 1024713 - Fix a compilation error in cairo with clang-cl;
 r=jrmuizel

---
 gfx/cairo/cairo/src/cairo-compiler-private.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/gfx/cairo/cairo/src/cairo-compiler-private.h b/gfx/cairo/cairo/src/cairo-compiler-private.h
index 9a05831534d..fe20b2f3dca 100644
--- a/gfx/cairo/cairo/src/cairo-compiler-private.h
+++ b/gfx/cairo/cairo/src/cairo-compiler-private.h
@@ -197,7 +197,11 @@
 #define unlikely(expr) (expr)
 #endif
 
-#ifndef __GNUC__
+/*
+ * clang-cl supports __attribute__, but MSVC doesn't, so we need to make sure
+ * we do this if not GNUC but also if not clang either.
+ */
+#if !defined(__GNUC__) && !defined(__clang__)
 #undef __attribute__
 #define __attribute__(x)
 #endif