From aec145ded3b9c0b4f928fb7cb1d92faac4e0e89a Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Mon, 28 Sep 2015 13:17:17 -0700
Subject: [PATCH] [osx] Fix build on Xcode 6.4

---
 bin/render.cpp | 7 +------
 macosx/main.mm | 7 +------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/bin/render.cpp b/bin/render.cpp
index 2248d8603..b89ca256e 100644
--- a/bin/render.cpp
+++ b/bin/render.cpp
@@ -9,17 +9,12 @@
 #include <mbgl/storage/default_file_source.hpp>
 #include <mbgl/storage/sqlite_cache.hpp>
 
-#pragma clang diagnostic push
 #pragma GCC diagnostic push
-#ifdef __clang__
-#pragma clang diagnostic ignored "-Wunused-local-typedefs"
-#else
+#pragma GCC diagnostic ignored "-Wunknown-pragmas"
 #pragma GCC diagnostic ignored "-Wunused-local-typedefs"
 #pragma GCC diagnostic ignored "-Wshadow"
-#endif
 #include <boost/program_options.hpp>
 #pragma GCC diagnostic pop
-#pragma clang diagnostic pop
 
 namespace po = boost::program_options;
 
diff --git a/macosx/main.mm b/macosx/main.mm
index 7698773e7..34cd7872b 100644
--- a/macosx/main.mm
+++ b/macosx/main.mm
@@ -12,17 +12,12 @@
 
 #import <Foundation/Foundation.h>
 
-#pragma clang diagnostic push
 #pragma GCC diagnostic push
-#ifdef __clang__
-#pragma clang diagnostic ignored "-Wunused-local-typedefs"
-#else
+#pragma GCC diagnostic ignored "-Wunknown-pragmas"
 #pragma GCC diagnostic ignored "-Wunused-local-typedefs"
 #pragma GCC diagnostic ignored "-Wshadow"
-#endif
 #include <boost/program_options.hpp>
 #pragma GCC diagnostic pop
-#pragma clang diagnostic pop
 
 #include <iostream>