BeamMP/BeamMP-Server
1
0
Fork 0
mirror of https://github.com/BeamMP/BeamMP-Server.git synced 2026-02-16 10:41:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed windows build

Browse Source
This commit is contained in:
Anonymous275
2020-11-06 16:43:18 +02:00
parent b49abe02eb
commit e5a0d43024
35 changed files with 40 additions and 9445 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Network/Auth.cpp
View File

@@ -32,7 +32,11 @@ bool Send(SOCKET TCPSock,std::string Data){
}
std::string Rcv(SOCKET TCPSock){
uint32_t RealSize;
int64_t BytesRcv = recv(TCPSock, &RealSize, sizeof(RealSize), 0);
#ifdef WIN32
int64_t BytesRcv = recv(TCPSock, reinterpret_cast<char*>(&RealSize), sizeof(RealSize), 0);
#else
int64_t BytesRcv = recv(TCPSock, reinterpret_cast<void*>(&RealSize), sizeof(RealSize), 0);
#endif
if (BytesRcv != sizeof(RealSize)) {
error(std::string(Sec("invalid packet: expected 4, got ")) + std::to_string(BytesRcv));
return "";
@@ -193,18 +197,18 @@ void Identify(SOCKET TCPSock){
// reason MSVC defines __try and __except and libg++ defines
// __try and __catch so its all a big mess if we leave this in or undefine
// the macros
#ifdef WIN32
/*#ifdef WIN32
__try{
#endif // WIN32
#endif // WIN32*/
Identification(TCPSock,S,Skey);
#ifdef WIN32
/*#ifdef WIN32
}__except(1){
if(TCPSock != -1){
error("died on " + std::string(__func__) + ":" + std::to_string(__LINE__));
closesocket(TCPSock);
}
}
#endif // WIN32
#endif // WIN32*/
delete Skey;
delete S;