From 14bcb21373d1d13a3f07b7c9a4bef139784f7834 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Bylica?= <pawel.bylica@imapp.pl>
Date: Mon, 23 Feb 2015 14:43:03 +0100
Subject: [PATCH] Fixing EVMJIT build on Mac OS

---
 evmjit/libevmjit/ExecStats.h                        | 1 +
 evmjit/libevmjit/preprocessor/llvm_includes_end.h   | 2 ++
 evmjit/libevmjit/preprocessor/llvm_includes_start.h | 4 ++++
 3 files changed, 7 insertions(+)

diff --git a/evmjit/libevmjit/ExecStats.h b/evmjit/libevmjit/ExecStats.h
index 498e21341..1ac9b6995 100644
--- a/evmjit/libevmjit/ExecStats.h
+++ b/evmjit/libevmjit/ExecStats.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <string>
 #include <chrono>
 
 #include "ExecutionEngine.h"
diff --git a/evmjit/libevmjit/preprocessor/llvm_includes_end.h b/evmjit/libevmjit/preprocessor/llvm_includes_end.h
index 023c8021e..2ead6dda3 100644
--- a/evmjit/libevmjit/preprocessor/llvm_includes_end.h
+++ b/evmjit/libevmjit/preprocessor/llvm_includes_end.h
@@ -1,5 +1,7 @@
 #if defined(_MSC_VER)
 	#pragma warning(pop)
+#elif defined(__clang__)
+	#pragma clang diagnostic pop
 #else
 	#pragma GCC diagnostic pop
 #endif
diff --git a/evmjit/libevmjit/preprocessor/llvm_includes_start.h b/evmjit/libevmjit/preprocessor/llvm_includes_start.h
index bf34ade99..699db91f2 100644
--- a/evmjit/libevmjit/preprocessor/llvm_includes_start.h
+++ b/evmjit/libevmjit/preprocessor/llvm_includes_start.h
@@ -1,6 +1,10 @@
 #if defined(_MSC_VER)
 	#pragma warning(push)
 	#pragma warning(disable: 4267 4244 4800)
+#elif defined(__clang__)
+	#pragma clang diagnostic push
+	#pragma clang diagnostic ignored "-Wunused-parameter
+	#pragma clang diagnostic ignored "-Wconversion"
 #else
 	#pragma GCC diagnostic push
 	#pragma GCC diagnostic ignored "-Wunused-parameter"