From d53b058ec3f6208f34884ed572bb5d47de932108 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 31 May 2016 01:48:18 +0300 Subject: Fix different include issues. --- src/net/tmwa/messagein.cpp | 4 ++++ src/net/tmwa/messageout.cpp | 6 ++++-- src/net/tmwa/network.cpp | 1 + src/net/tmwa/packetsout.inc | 2 ++ src/net/tmwa/protocolout.cpp | 3 ++- src/net/tmwa/protocolout.h | 2 ++ src/net/tmwa/recvpackets.inc | 2 ++ src/net/tmwa/updateprotocol.cpp | 7 +++++++ 8 files changed, 24 insertions(+), 3 deletions(-) (limited to 'src/net/tmwa') 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 - #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 . */ +#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 -- cgit v1.2.3-70-g09d2