Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Donald Haase
Cockatrice
Commits
4d8218da
Commit
4d8218da
authored
Feb 21, 2015
by
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
Changes
1
Hide whitespace changes
Inline
Side-by-side
common/user_level.h
View file @
4d8218da
#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>
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment