From 4d8218da13d609d7e3202828d2df383fa71da68f Mon Sep 17 00:00:00 2001
From: Gavin Bises <daenyth@gmail.com>
Date: Sat, 21 Feb 2015 07:16:51 -0500
Subject: [PATCH] Avoid compilation failure due to protobuf bug on osx

https://code.google.com/p/protobuf/issues/detail?id=119
---
 common/user_level.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/common/user_level.h b/common/user_level.h
index cf743b8d..fb0731ae 100644
--- a/common/user_level.h
+++ b/common/user_level.h
@@ -1,6 +1,11 @@
 #ifndef USER_LEVEL_H
 #define USER_LEVEL_H
 
+#ifdef Q_OS_OSX
+// avoid collision from Mac OS X's ConditionalMacros.h
+// https://code.google.com/p/protobuf/issues/detail?id=119
+#undef TYPE_BOOL
+#endif
 #include "pb/serverinfo_user.pb.h"
 #include <QFlags>