mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-29 07:37:45 +00:00
Code Activity

Windows build fix

Browse source
This commit is contained in:
Mordred 2017-12-18 23:10:36 +01:00
parent 4606e83d15
commit 232d9cd1ad
5 changed files with 8 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/common/Common.h
View file

@ -1,7 +1,6 @@
#ifndef _COMMON_H #ifndef _COMMON_H
#define _COMMON_H #define _COMMON_H
#include <stdint.h>
#include <cstdint> #include <cstdint>
#include <vector> #include <vector>

5
src/common/Crypt/blowfish.h
View file

@ -1,3 +1,5 @@
#ifndef _BLOWFISH_H
#define _BLOWFISH_H
// blowfish.h interface file for blowfish.cpp // blowfish.h interface file for blowfish.cpp
// _THE BLOWFISH ENCRYPTION ALGORITHM_ // _THE BLOWFISH ENCRYPTION ALGORITHM_
// by Bruce Schneier // by Bruce Schneier
@ -7,7 +9,7 @@
#define MAXKEYBYTES 56 // 448 bits max #define MAXKEYBYTES 56 // 448 bits max
#define NPASS 16 // SBox passes #define NPASS 16 // SBox passes
#define DWORD uint32_t #define DWORD uint32_t
#define WORD unsigned short #define WORD unsigned short
#define BYTE uint8_t #define BYTE uint8_t
@ -70,3 +72,4 @@ public:
} w; } w;
}; };
#endif #endif
#endif

3
src/common/Crypt/md5.h
View file

@ -1,7 +1,6 @@
#include <stdint.h>
#ifndef _MD52_H #ifndef _MD52_H
#define _MD52_H #define _MD52_H
#include <stdint.h>
namespace Core namespace Core
{ {

2
src/common/Version.cpp
View file

@ -3,7 +3,7 @@
namespace Core { namespace Core {
namespace Version { namespace Version {
const std::string GIT_HASH = "32d886675c6f621494001715e6cf9c99217e1b48"; const std::string GIT_HASH = "4606e83d151f02fa17e98e832c01b3680987b5f5";
const std::string VERSION = "-128-NOTFOUND"; const std::string VERSION = "-128-NOTFOUND";
} /* Version */ } /* Version */

12
src/servers/Server_Lobby/GameConnection.cpp
View file

@ -1,3 +1,5 @@
#include "GameConnection.h"
#include <common/Common.h> #include <common/Common.h>
#include <common/Network/CommonNetwork.h> #include <common/Network/CommonNetwork.h>
#include <common/Util/Util.h> #include <common/Util/Util.h>
@ -9,21 +11,11 @@
#include <common/Crypt/md5.h> #include <common/Crypt/md5.h>
#include <common/Crypt/blowfish.h> #include <common/Crypt/blowfish.h>
#include <boost/format.hpp>
#include <boost/property_tree/ptree.hpp>
#include <boost/property_tree/json_parser.hpp> #include <boost/property_tree/json_parser.hpp>
#include <boost/foreach.hpp>
#include "GameConnection.h"
#include "ServerLobby.h" #include "ServerLobby.h"
#include "LobbyPacketContainer.h"
#include "RestConnector.h" #include "RestConnector.h"
#include "LobbySession.h" #include "LobbySession.h"
#include "Forwards.h"
extern Core::Logger g_log; extern Core::Logger g_log;
extern Core::ServerLobby g_serverLobby; extern Core::ServerLobby g_serverLobby;