mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-08-22 08:45:06 -05:00
Avoid compilation failure due to protobuf bug on osx
https://code.google.com/p/protobuf/issues/detail?id=119
This commit is contained in:
@@ -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>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user