diff --git a/src/PlatformSockets.c b/src/PlatformSockets.c index a144f06..6eee372 100644 --- a/src/PlatformSockets.c +++ b/src/PlatformSockets.c @@ -286,7 +286,6 @@ int enableNoDelay(SOCKET s) { int resolveHostName(const char* host, int family, int tcpTestPort, struct sockaddr_storage* addr, SOCKADDR_LEN* addrLen) { -#ifndef __vita__ struct addrinfo hints, *res, *currentAddr; int err; @@ -331,21 +330,6 @@ int resolveHostName(const char* host, int family, int tcpTestPort, struct sockad Limelog("No working addresses found for host: %s\n", host); freeaddrinfo(res); return -1; -#else - struct hostent *phost = gethostbyname(host); - if (!phost) { - Limelog("gethostbyname() failed for host %s\n", host); - return -1; - } - struct sockaddr_in tmp = {0}; - tmp.sin_len = sizeof(tmp); - tmp.sin_family = SCE_NET_AF_INET; - memcpy(&tmp.sin_addr, phost->h_addr, phost->h_length); - - memcpy(addr, &tmp, sizeof(tmp)); - *addrLen = sizeof(tmp); - return 0; -#endif } #ifndef __vita__ diff --git a/src/PlatformSockets.h b/src/PlatformSockets.h index 39c92f1..44e4459 100644 --- a/src/PlatformSockets.h +++ b/src/PlatformSockets.h @@ -18,26 +18,21 @@ typedef int SOCK_RET; typedef int SOCKADDR_LEN; #else -#if defined(__vita__) + +#include +#include +#include +#ifndef __vita__ +#include +#else #include #include -#include -#include -#include -#include -#include -#include -#else -#include -#include -#include -#include +#endif #include #include #include #include #include -#endif #define ioctlsocket ioctl #define LastSocketError() errno @@ -56,8 +51,6 @@ typedef socklen_t SOCKADDR_LEN; #define sockaddr_in6 sockaddr_in #define sin6_addr sin_addr #define sin6_port sin_port -#define INET6_ADDRSTRLEN 128 -#define inet_ntop sceNetInetNtop #endif #define LastSocketFail() ((LastSocketError() != 0) ? LastSocketError() : -1)