diff options
author | Andrei Karas <akaras@inbox.ru> | 2016-05-31 01:48:18 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2016-05-31 01:48:18 +0300 |
commit | d53b058ec3f6208f34884ed572bb5d47de932108 (patch) | |
tree | 980acf66aaa3b5df6b7e3e7e08dfccc0b9af8827 /src/net/eathena | |
parent | 4530a341c65ac12e50075fb3e3d6166cd2e1fe3b (diff) | |
download | ManaVerse-d53b058ec3f6208f34884ed572bb5d47de932108.tar.gz ManaVerse-d53b058ec3f6208f34884ed572bb5d47de932108.tar.bz2 ManaVerse-d53b058ec3f6208f34884ed572bb5d47de932108.tar.xz ManaVerse-d53b058ec3f6208f34884ed572bb5d47de932108.zip |
Fix different include issues.
Diffstat (limited to 'src/net/eathena')
-rw-r--r-- | src/net/eathena/maptypeproperty2.h | 2 | ||||
-rw-r--r-- | src/net/eathena/messagein.cpp | 4 | ||||
-rw-r--r-- | src/net/eathena/messageout.cpp | 6 | ||||
-rw-r--r-- | src/net/eathena/network.cpp | 1 | ||||
-rw-r--r-- | src/net/eathena/packetsout.inc | 2 | ||||
-rw-r--r-- | src/net/eathena/protocolout.cpp | 3 | ||||
-rw-r--r-- | src/net/eathena/protocolout.h | 2 | ||||
-rw-r--r-- | src/net/eathena/recvpackets.inc | 2 | ||||
-rw-r--r-- | src/net/eathena/updateprotocol.cpp | 6 |
9 files changed, 25 insertions, 3 deletions
diff --git a/src/net/eathena/maptypeproperty2.h b/src/net/eathena/maptypeproperty2.h index da069ac96..e8602ffbe 100644 --- a/src/net/eathena/maptypeproperty2.h +++ b/src/net/eathena/maptypeproperty2.h @@ -21,6 +21,8 @@ #ifndef NET_EATHENA_MAPTYPEPROPERTY2_H #define NET_EATHENA_MAPTYPEPROPERTY2_H +#include "localconsts.h" + #if defined(__GXX_EXPERIMENTAL_CXX0X__) #include <cstdint> #else diff --git a/src/net/eathena/messagein.cpp b/src/net/eathena/messagein.cpp index 34edbe39d..7137b468b 100644 --- a/src/net/eathena/messagein.cpp +++ b/src/net/eathena/messagein.cpp @@ -31,6 +31,10 @@ #include "debug.h" +#ifndef SDL_BYTEORDER +#error missing SDL_endian.h +#endif + namespace EAthena { diff --git a/src/net/eathena/messageout.cpp b/src/net/eathena/messageout.cpp index a20d924c9..83fc381c5 100644 --- a/src/net/eathena/messageout.cpp +++ b/src/net/eathena/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 EAthena { diff --git a/src/net/eathena/network.cpp b/src/net/eathena/network.cpp index 2511f8e57..c5f0adad5 100644 --- a/src/net/eathena/network.cpp +++ b/src/net/eathena/network.cpp @@ -108,6 +108,7 @@ Network::~Network() void Network::registerHandlers() { #include "net/eathena/recvpackets.inc" +RECVPACKETS_VOID } void Network::clearHandlers() diff --git a/src/net/eathena/packetsout.inc b/src/net/eathena/packetsout.inc index 603a62f22..1cf5f2780 100644 --- a/src/net/eathena/packetsout.inc +++ b/src/net/eathena/packetsout.inc @@ -20,6 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#define PACKETSOUT_VOID + // 0 packet(CMSG_SERVER_VERSION_REQUEST, 0x7530, 0, nullptr); diff --git a/src/net/eathena/protocolout.cpp b/src/net/eathena/protocolout.cpp index 44e5477d6..00f455aca 100644 --- a/src/net/eathena/protocolout.cpp +++ b/src/net/eathena/protocolout.cpp @@ -23,7 +23,8 @@ namespace EAthena #include "net/protocoloutdefine.h" #include "net/eathena/packetsout.inc" #undef packet - +PROTOCOLOUT_VOID +PACKETSOUT_VOID } // namespace EAthena #include "debug.h" diff --git a/src/net/eathena/protocolout.h b/src/net/eathena/protocolout.h index 4f4572050..fa8319c92 100644 --- a/src/net/eathena/protocolout.h +++ b/src/net/eathena/protocolout.h @@ -23,6 +23,8 @@ #include "net/protocoloutinclude.h" +#define PROTOCOLOUT_VOID + namespace EAthena { #include "net/eathena/packetsout.inc" diff --git a/src/net/eathena/recvpackets.inc b/src/net/eathena/recvpackets.inc index 29e3d433d..9dbe9d3f6 100644 --- a/src/net/eathena/recvpackets.inc +++ b/src/net/eathena/recvpackets.inc @@ -21,6 +21,8 @@ #ifndef NET_EATHENA_RECVPACKETS_H #define NET_EATHENA_RECVPACKETS_H +#define RECVPACKETS_VOID + #include "net/recvpacketdefine.h" #include "net/eathena/packetsin.inc" diff --git a/src/net/eathena/updateprotocol.cpp b/src/net/eathena/updateprotocol.cpp index b14c4b89a..a23ea51bb 100644 --- a/src/net/eathena/updateprotocol.cpp +++ b/src/net/eathena/updateprotocol.cpp @@ -30,6 +30,8 @@ extern int packetVersion; extern int serverVersion; +PACKETSOUT_VOID +#undef PACKETSOUT_VOID namespace EAthena { @@ -48,4 +50,8 @@ void updateProtocol() } } +PACKETSOUT_VOID +PROTOCOLOUTUPDATE_VOID +PROTOCOLOUT_VOID + } // namespace EAthena |