TheCloneArmy/mcrcon
1
0
Fork 0
mirror of https://github.com/Tiiffi/mcrcon.git synced 2025-10-27 11:21:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

Commented windows version define and changed net_init_WSA() to request Winsock version 2.2 instead of old 1.1.

Browse Source
This commit is contained in:
Tiiffi
2016-10-28 01:40:38 +03:00
parent 4b663958aa
commit a0d3d7f52e
1 changed files with 22 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
mcrcon.c
View File

@ -32,7 +32,7 @@
#ifdef _WIN32
/* for name resolving on windows */
#define _WIN32_WINNT 0x0501
//#define _WIN32_WINNT 0x0501
#include <ws2tcpip.h>
#include <winsock2.h>
@ -176,12 +176,12 @@ int main(int argc, char *argv[])
/* else fprintf (stderr, "Unknown option -%c\n\n", optopt); */
usage();
break;
usage();
break;
default: abort();
default: exit(-1);
}
}
}
if (host == NULL)
{
@ -269,32 +269,30 @@ void error(char *errstring)
#ifdef _WIN32
void net_init_WSA(void)
{
WSADATA wsadata;
int err;
WSADATA wsadata;
err = WSAStartup(MAKEWORD(1, 1), &wsadata);
if(err != 0)
{
fprintf(stderr, "WSAStartup failed. Errno: %d.\n", err);
exit(-1);
}
// Request winsock 2.2 for now.
// Should be compatible down to Win XP.
WORD version = MAKEWORD(2, 2);
int err = WSAStartup(version, &wsadata);
if (err != 0)
{
fprintf(stderr, "WSAStartup failed. Error: %d.\n", err);
exit(-1);
}
}
#endif
/*
void net_get_last_error(int ret)
{
}
*/
/* socket close and cleanup */
void net_close(int sd)
{
#ifdef _WIN32
closesocket(sd);
WSACleanup();
#else
close(sd);
#endif
#ifdef _WIN32
closesocket(sd);
WSACleanup();
#else
close(sd);
#endif
}
/* Opens and connects socket */