Fix disarm warnings in clang more properly

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