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

unbreak with protobuf 3.7+

Index: src/mumble/Messages.cpp
--- src/mumble/Messages.cpp.orig
+++ src/mumble/Messages.cpp
@@ -41,7 +41,6 @@
 #include "Connection.h"
 #include "ConnectDialog.h"
 #include "Database.h"
-#include "Global.h"
 #include "GlobalShortcut.h"
 #include "Log.h"
 #include "MainWindow.h"
@@ -54,6 +53,9 @@
 #include "UserModel.h"
 #include "VersionCheck.h"
 #include "ViewCert.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"
 
 #define ACTOR_INIT \
 	ClientUser *pSrc=NULL; \
