From f58769c8f177601fe73cdec2042a0a65801261b3 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Tue, 10 Feb 2015 15:46:44 +0100
Subject: Properly check for Clang with static initializer_list bug

Change-Id: I98060f1adae0ba8ec03b2f0d6b0db6d5a1c0385c
---
 oox/source/export/shapes.cxx | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'oox/source/export/shapes.cxx')

diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index fba5b8d5fe1a..4ef0838f233f 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -17,6 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/config.h>
+
+#include <config_global.h>
 #include <unotools/mediadescriptor.hxx>
 #include <filter/msfilter/util.hxx>
 #include "oox/core/xmlfilterbase.hxx"
@@ -283,7 +286,7 @@ ShapeExport& ShapeExport::WriteGroupShape(uno::Reference<drawing::XShape> xShape
 
 static bool lcl_IsOnBlacklist(OUString& rShapeType)
 {
-#if !defined __clang__
+#if !HAVE_BROKEN_STATIC_INITILIZER_LIST
     static
 #endif
     const std::initializer_list<OUStringLiteral> vBlacklist = {
@@ -347,7 +350,7 @@ static bool lcl_IsOnBlacklist(OUString& rShapeType)
 
 static bool lcl_IsOnWhitelist(OUString& rShapeType)
 {
-#if !defined __clang__
+#if !HAVE_BROKEN_STATIC_INITILIZER_LIST
     static
 #endif
     const std::initializer_list<OUStringLiteral> vWhitelist = {
-- 
cgit