From 31a1384379669c4edc4091344ee82ec3a8258a2e Mon Sep 17 00:00:00 2001
From: Sunguk Lee <d3m3vilurr@gmail.com>
Date: Wed, 14 Aug 2019 03:00:16 +0900
Subject: [PATCH 1/2] vita: Apply newlib changes

no more need to define `TCP_NODELAY` and `sockaddr_in6` parts
---
 src/PlatformSockets.h | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/src/PlatformSockets.h b/src/PlatformSockets.h
index 44e4459..e889c75 100644
--- a/src/PlatformSockets.h
+++ b/src/PlatformSockets.h
@@ -22,12 +22,7 @@ typedef int SOCKADDR_LEN;
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/select.h>
-#ifndef __vita__
 #include <netinet/tcp.h>
-#else
-#include <psp2/net/net.h>
-#include <enet/enet.h>
-#endif
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netdb.h>
@@ -45,14 +40,6 @@ typedef ssize_t SOCK_RET;
 typedef socklen_t SOCKADDR_LEN;
 #endif
 
-#if defined(__vita__)
-#define TCP_NODELAY SCE_NET_TCP_NODELAY
-
-#define sockaddr_in6 sockaddr_in
-#define sin6_addr sin_addr
-#define sin6_port sin_port
-#endif
-
 #define LastSocketFail() ((LastSocketError() != 0) ? LastSocketError() : -1)
 
 // IPv6 addresses have 2 extra characters for URL escaping

From a5c10547421b1d662cde60ddcd952ef7dca0bc93 Mon Sep 17 00:00:00 2001
From: Sunguk Lee <d3m3vilurr@gmail.com>
Date: Sat, 5 Oct 2019 20:07:41 +0900
Subject: [PATCH 2/2] vita: Remove more vita specific branches

---
 src/PlatformSockets.c | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/PlatformSockets.c b/src/PlatformSockets.c
index 6eee372..b64be6e 100644
--- a/src/PlatformSockets.c
+++ b/src/PlatformSockets.c
@@ -114,11 +114,7 @@ SOCKET bindUdpSocket(int addrfamily, int bufferSize) {
     struct sockaddr_storage addr;
     int err;
 
-#ifndef __vita__
     LC_ASSERT(addrfamily == AF_INET || addrfamily == AF_INET6);
-#else
-    LC_ASSERT(addrfamily == AF_INET);
-#endif
 
     s = socket(addrfamily, SOCK_DGRAM, IPPROTO_UDP);
     if (s == INVALID_SOCKET) {
@@ -332,7 +328,6 @@ int resolveHostName(const char* host, int family, int tcpTestPort, struct sockad
     return -1;
 }
 
-#ifndef __vita__
 int isInSubnetV6(struct sockaddr_in6* sin6, unsigned char* subnet, int prefixLength) {
     int i;
     
@@ -345,7 +340,6 @@ int isInSubnetV6(struct sockaddr_in6* sin6, unsigned char* subnet, int prefixLen
     
     return 1;
 }
-#endif
 
 int isPrivateNetworkAddress(struct sockaddr_storage* address) {
 
@@ -373,7 +367,6 @@ int isPrivateNetworkAddress(struct sockaddr_storage* address) {
             return 1;
         }
     }
-#ifndef __vita__
     else if (address->ss_family == AF_INET6) {
         struct sockaddr_in6* sin6 = (struct sockaddr_in6*)address;
         static unsigned char linkLocalPrefix[] = {0xfe, 0x80};
@@ -393,7 +386,6 @@ int isPrivateNetworkAddress(struct sockaddr_storage* address) {
             return 1;
         }
     }
-#endif
 
     return 0;
 }