summaryrefslogtreecommitdiff
path: root/src/net/tmwa
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-05-31 01:48:18 +0300
committerAndrei Karas <akaras@inbox.ru>2016-05-31 01:48:18 +0300
commitd53b058ec3f6208f34884ed572bb5d47de932108 (patch)
tree980acf66aaa3b5df6b7e3e7e08dfccc0b9af8827 /src/net/tmwa
parent4530a341c65ac12e50075fb3e3d6166cd2e1fe3b (diff)
downloadmv-d53b058ec3f6208f34884ed572bb5d47de932108.tar.gz
mv-d53b058ec3f6208f34884ed572bb5d47de932108.tar.bz2
mv-d53b058ec3f6208f34884ed572bb5d47de932108.tar.xz
mv-d53b058ec3f6208f34884ed572bb5d47de932108.zip
Fix different include issues.
Diffstat (limited to 'src/net/tmwa')
-rw-r--r--src/net/tmwa/messagein.cpp4
-rw-r--r--src/net/tmwa/messageout.cpp6
-rw-r--r--src/net/tmwa/network.cpp1
-rw-r--r--src/net/tmwa/packetsout.inc2
-rw-r--r--src/net/tmwa/protocolout.cpp3
-rw-r--r--src/net/tmwa/protocolout.h2
-rw-r--r--src/net/tmwa/recvpackets.inc2
-rw-r--r--src/net/tmwa/updateprotocol.cpp7
8 files changed, 24 insertions, 3 deletions
diff --git a/src/net/tmwa/messagein.cpp b/src/net/tmwa/messagein.cpp
index a5fac5ac9..095ee91bf 100644
--- a/src/net/tmwa/messagein.cpp
+++ b/src/net/tmwa/messagein.cpp
@@ -31,6 +31,10 @@
#include "debug.h"
+#ifndef SDL_BYTEORDER
+#error missing SDL_endian.h
+#endif
+
namespace TmwAthena
{
diff --git a/src/net/tmwa/messageout.cpp b/src/net/tmwa/messageout.cpp
index 82a67e924..237d4f185 100644
--- a/src/net/tmwa/messageout.cpp
+++ b/src/net/tmwa/messageout.cpp
@@ -28,10 +28,12 @@
#include "logger.h"
-#include <SDL_endian.h>
-
#include "debug.h"
+#ifndef SDL_BYTEORDER
+#error missing SDL_endian.h
+#endif
+
namespace TmwAthena
{
diff --git a/src/net/tmwa/network.cpp b/src/net/tmwa/network.cpp
index 66bf166e1..bf574b567 100644
--- a/src/net/tmwa/network.cpp
+++ b/src/net/tmwa/network.cpp
@@ -86,6 +86,7 @@ Network::~Network()
void Network::registerHandlers()
{
#include "net/tmwa/recvpackets.inc"
+RECVPACKETS_VOID
}
void Network::clearHandlers()
diff --git a/src/net/tmwa/packetsout.inc b/src/net/tmwa/packetsout.inc
index 339863cf0..f789791df 100644
--- a/src/net/tmwa/packetsout.inc
+++ b/src/net/tmwa/packetsout.inc
@@ -20,6 +20,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#define PACKETSOUT_VOID
+
packet(CMSG_SERVER_VERSION_REQUEST, 0x7530, 0, nullptr);
packet(CMSG_LOGIN_REGISTER, 0x0064, 0, nullptr);
diff --git a/src/net/tmwa/protocolout.cpp b/src/net/tmwa/protocolout.cpp
index 8332ceb8d..d8d123eee 100644
--- a/src/net/tmwa/protocolout.cpp
+++ b/src/net/tmwa/protocolout.cpp
@@ -23,7 +23,8 @@ namespace TmwAthena
#include "net/protocoloutdefine.h"
#include "net/tmwa/packetsout.inc"
#undef packet
-
+PROTOCOLOUT_VOID
+PACKETSOUT_VOID
} // namesspace TmwAthena
#include "debug.h"
diff --git a/src/net/tmwa/protocolout.h b/src/net/tmwa/protocolout.h
index 413e458ef..2686cd9f5 100644
--- a/src/net/tmwa/protocolout.h
+++ b/src/net/tmwa/protocolout.h
@@ -23,6 +23,8 @@
#include "net/protocoloutinclude.h"
+#define PROTOCOLOUT_VOID
+
namespace TmwAthena
{
#include "net/tmwa/packetsout.inc"
diff --git a/src/net/tmwa/recvpackets.inc b/src/net/tmwa/recvpackets.inc
index 8c1a59253..3afbf07bb 100644
--- a/src/net/tmwa/recvpackets.inc
+++ b/src/net/tmwa/recvpackets.inc
@@ -21,6 +21,8 @@
#ifndef NET_TMWA_RECVPACKETS_H
#define NET_TMWA_RECVPACKETS_H
+#define RECVPACKETS_VOID
+
#include "net/recvpacketdefine.h"
#include "net/tmwa/packetsin.inc"
diff --git a/src/net/tmwa/updateprotocol.cpp b/src/net/tmwa/updateprotocol.cpp
index a07ccc319..7d5622acd 100644
--- a/src/net/tmwa/updateprotocol.cpp
+++ b/src/net/tmwa/updateprotocol.cpp
@@ -25,6 +25,9 @@
#include "debug.h"
+PACKETSOUT_VOID
+#undef PACKETSOUT_VOID
+
namespace TmwAthena
{
@@ -42,4 +45,8 @@ void updateProtocol()
}
}
+PACKETSOUT_VOID
+PROTOCOLOUTUPDATE_VOID
+PROTOCOLOUT_VOID
+
} // namespace TmwAthena