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