Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mumble-voip/mumble.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Adam <dev@robert-adam.de>2021-03-04 13:09:32 +0300
committerRobert Adam <dev@robert-adam.de>2021-03-06 20:57:22 +0300
commitdda161138b3e48e9d1f01f7de07e4347691e9f69 (patch)
tree90df533dddec0aa06aadb5b5f4036ad21c1c0d05 /src/murmur/Server.cpp
parentd6f9e97ad64828066d5134c9d87e2673847eed79 (diff)
REFAC: Make sure all macros are #undef'd again
If they are not there is the potential of name clashes when performing a unity build. See: https://stackoverflow.com/questions/847974/the-benefits-disadvantages-of-unity-builds
Diffstat (limited to 'src/murmur/Server.cpp')
-rw-r--r--src/murmur/Server.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/murmur/Server.cpp b/src/murmur/Server.cpp
index 3f879f682..a47816d95 100644
--- a/src/murmur/Server.cpp
+++ b/src/murmur/Server.cpp
@@ -1753,6 +1753,8 @@ void Server::message(unsigned int uiType, const QByteArray &qbaMsg, ServerUser *
#endif
switch (uiType) { MUMBLE_MH_ALL }
+
+#undef MUMBLE_MH_MSG
}
void Server::checkTimeout() {
@@ -2288,3 +2290,8 @@ bool Server::canNest(Channel *newParent, Channel *channel) const {
return (parentLevel + channelDepth) < iChannelNestingLimit;
}
+
+#undef MAX
+#undef UDP_PACKET_SIZE
+#undef SIO_UDP_CONNRESET
+#undef SENDTO