Avoid compilation failure due to protobuf bug on osx
https://code.google.com/p/protobuf/issues/detail?id=119
This commit is contained in:
parent
06e5327595
commit
4d8218da13
1 changed files with 5 additions and 0 deletions
|
@ -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>
|
||||
|
||||
|
|
Loading…
Reference in a new issue