Tha_14/toxic
1
0
Fork 0
mirror of https://github.com/Tha14/toxic.git synced 2024-11-26 14:03:27 +01:00
Code Issues Projects Releases Wiki Activity

Improved msvc compatibility

Browse Source
This commit is contained in:
Sean Qureshi 2013-08-28 10:04:54 -07:00
parent 4616aef070
commit e6835483ce
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main.c
View File

@ -20,7 +20,7 @@
#include <locale.h> #include <locale.h>
#include <string.h> #include <string.h>
#ifdef WIN32 #ifdef _WIN32
#include <direct.h> #include <direct.h>
#include <winsock2.h> #include <winsock2.h>
#include <ws2tcpip.h> #include <ws2tcpip.h>
@ -98,7 +98,7 @@ static Tox *init_tox()
tox_callback_action(m, on_action, NULL); tox_callback_action(m, on_action, NULL);
#ifdef __linux__ #ifdef __linux__
tox_setname(m, (uint8_t *) "Cool guy", sizeof("Cool guy")); tox_setname(m, (uint8_t *) "Cool guy", sizeof("Cool guy"));
#elif defined(WIN32) #elif defined(_WIN32)
tox_setname(m, (uint8_t *) "I should install GNU/Linux", sizeof("I should install GNU/Linux")); tox_setname(m, (uint8_t *) "I should install GNU/Linux", sizeof("I should install GNU/Linux"));
#elif defined(__APPLE__) #elif defined(__APPLE__)
tox_setname(m, (uint8_t *) "Hipster", sizeof("Hipster")); //This used to users of other Unixes are hipsters tox_setname(m, (uint8_t *) "Hipster", sizeof("Hipster")); //This used to users of other Unixes are hipsters
@ -128,7 +128,7 @@ uint32_t resolve_addr(const char *address)
hints.ai_family = AF_INET; // IPv4 only right now. hints.ai_family = AF_INET; // IPv4 only right now.
hints.ai_socktype = SOCK_DGRAM; // type of socket Tox uses. hints.ai_socktype = SOCK_DGRAM; // type of socket Tox uses.
#ifdef __WIN32__ #ifdef _WIN32
int res; int res;
WSADATA wsa_data; WSADATA wsa_data;
@ -142,7 +142,7 @@ uint32_t resolve_addr(const char *address)
// Lookup failed. // Lookup failed.
if (rc != 0) { if (rc != 0) {
#ifdef __WIN32__ #ifdef _WIN32
WSACleanup(); WSACleanup();
#endif #endif
return 0; return 0;
@ -151,7 +151,7 @@ uint32_t resolve_addr(const char *address)
// IPv4 records only.. // IPv4 records only..
if (server->ai_family != AF_INET) { if (server->ai_family != AF_INET) {
freeaddrinfo(server); freeaddrinfo(server);
#ifdef __WIN32__ #ifdef _WIN32
WSACleanup(); WSACleanup();
#endif #endif
return 0; return 0;
@ -161,7 +161,7 @@ uint32_t resolve_addr(const char *address)
addr = ((struct sockaddr_in *)server->ai_addr)->sin_addr.s_addr; addr = ((struct sockaddr_in *)server->ai_addr)->sin_addr.s_addr;
freeaddrinfo(server); freeaddrinfo(server);
#ifdef __WIN32__ #ifdef _WIN32
WSACleanup(); WSACleanup();
#endif #endif
return addr; return addr;