frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2025-03-01 10:33:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Proto*: fix Error macro conflict (#1146)

Browse Source 
Fixes: #882
This commit is contained in:
Gerion Entrup
2021-02-23 14:25:32 +01:00
committed by GitHub
parent f843b5a046
commit 6ed9553ca3
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libsrc/protoserver/ProtoClientConnection.h
View File

@@ -1,14 +1,16 @@
#pragma once
// protobuffer PROTO
// protobuf defines an Error() function itself, so undef it here
#undef Error
#include "message.pb.h"
// util
#include <utils/Logger.h>
#include <utils/Image.h>
#include <utils/ColorRgb.h>
#include <utils/Components.h>
// protobuffer PROTO
#include "message.pb.h"
class QTcpSocket;
class QTimer;