From a53f8738d8fa8bea24780880b6855251d4353f01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= <hrydgard@gmail.com>
Date: Mon, 9 Dec 2013 16:56:05 +0100
Subject: [PATCH] Fix disarm warnings in clang more properly

---
 ext/disarm.cpp | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/ext/disarm.cpp b/ext/disarm.cpp
index 005cb024c8..21e3321138 100644
--- a/ext/disarm.cpp
+++ b/ext/disarm.cpp
@@ -60,11 +60,11 @@
  *                    (Thanks to Vincent Zweije for reporting this.)
  */
 
-#ifdef clang-3.4
+#ifdef __clang__
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wtautological-compare" //used to avoid warning, force compiler to accept it.
-#endif clang-3.4
-
+#pragma GCC diagnostic ignored "-Wstring-plus-int"
+#endif
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -1054,7 +1054,6 @@ void ArmDis(unsigned int addr, unsigned int w, char *output, bool includeWord) {
 	}
 }
 
-#ifdef clang-3.4
+#ifdef __clang__
 #pragma GCC diagnostic pop
-#endif clang-3.4
-
+#endif