$OpenBSD: patch-src_mumble_ACLEditor_cpp,v 1.1 2019/08/05 17:42:40 sthen Exp $

unbreak with protobuf 3.7+

Index: src/mumble/ACLEditor.cpp
--- src/mumble/ACLEditor.cpp.orig
+++ src/mumble/ACLEditor.cpp
@@ -37,10 +37,12 @@
 #include "Channel.h"
 #include "ClientUser.h"
 #include "Database.h"
-#include "Global.h"
 #include "Log.h"
 #include "ServerHandler.h"
 #include "User.h"
+
+ // We define a global macro called 'g'. This can lead to issues when included code uses 'g' as a type or parameter name (like protobuf 3.7 does). As such, for now, we have to make this our last include.
+#include "Global.h"
 
 ACLGroup::ACLGroup(const QString &name) : Group(NULL, name) {
 	bInherited = false;
