aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Avoid compilation failure due to protobuf bug on osx

Browse source 
https://code.google.com/p/protobuf/issues/detail?id=119
This commit is contained in:
Gavin Bises 2015-02-21 07:16:51 -05:00
parent 06e5327595
commit 4d8218da13
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
common/user_level.h
View file

@ -1,6 +1,11 @@
#ifndef USER_LEVEL_H #ifndef USER_LEVEL_H
#define 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 "pb/serverinfo_user.pb.h"
#include <QFlags> #include <QFlags>