Commit 4d8218da authored by Gavin Bises's avatar Gavin Bises
Browse files

Avoid compilation failure due to protobuf bug on osx

https://code.google.com/p/protobuf/issues/detail?id=119
parent 06e53275
#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>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment