summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThorbjørn Lindeijer <bjorn@lindeijer.nl>2025-07-03 11:39:07 +0200
committerThorbjørn Lindeijer <bjorn@lindeijer.nl>2025-07-03 11:39:07 +0200
commit184f62792ae80c68a06f8b36c750c39c830251ee (patch)
treef3fdacc5df538ea15654e5b7d043008b5b087402
parente9a4eec0246b918417f4e92e9496c91506f49ccf (diff)
downloadmana-184f62792ae80c68a06f8b36c750c39c830251ee.tar.gz
mana-184f62792ae80c68a06f8b36c750c39c830251ee.tar.bz2
mana-184f62792ae80c68a06f8b36c750c39c830251ee.tar.xz
mana-184f62792ae80c68a06f8b36c750c39c830251ee.zip
Avoid warning on Windows
A compatible definition of MAKEWORD may already get pulled in from the Windows include minwindef.h.
-rw-r--r--src/net/tmwa/messagein.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/net/tmwa/messagein.cpp b/src/net/tmwa/messagein.cpp
index c0db0fca..2630c511 100644
--- a/src/net/tmwa/messagein.cpp
+++ b/src/net/tmwa/messagein.cpp
@@ -26,9 +26,11 @@
#include <SDL_endian.h>
+#ifndef MAKEWORD
#define MAKEWORD(low,high) \
((unsigned short)(((unsigned char)(low)) | \
((unsigned short)((unsigned char)(high))) << 8))
+#endif
namespace TmwAthena {