jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-10 00:04:48 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #769 from Cockatrice/fix-osx-compile-bug

Browse source 
Avoid compilation failure due to protobuf bug on osx
This commit is contained in:
Zach 2015-02-21 13:08:17 -05:00
commit 510fe4e0fb
1 changed files with 5 additions and 0 deletions
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
#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>