mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-16 08:43:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

(3DS/CTR) Take out HAVE_SOCKET_LEGACY for 3DS as per Cthulhu recommendation

Browse Source 
and instead put in the extra conditional for natt.c and netplay_frontend.c
This commit is contained in:
libretroadmin 2022-06-19 18:32:26 +02:00
parent 64bf25542f
commit 01eab0fba5
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.ctr
View File

@ -63,7 +63,7 @@ ifeq ($(GRIFFIN_BUILD), 1)
DEFINES += -DHAVE_GFX_WIDGETS DEFINES += -DHAVE_GFX_WIDGETS
DEFINES += -DHAVE_OVERLAY DEFINES += -DHAVE_OVERLAY
DEFINES += -DHAVE_CORE_INFO_CACHE DEFINES += -DHAVE_CORE_INFO_CACHE
DEFINES += -DHAVE_SOCKET_LEGACY #DEFINES += -DHAVE_SOCKET_LEGACY
#-DHAVE_SSL -DHAVE_BUILTINMBEDTLS -DMBEDTLS_SSL_DEBUG_ALL #-DHAVE_SSL -DHAVE_BUILTINMBEDTLS -DMBEDTLS_SSL_DEBUG_ALL
#ssl is currently incompatible with griffin due to use of the "static" flag on repeating functions that will conflict when included in one file #ssl is currently incompatible with griffin due to use of the "static" flag on repeating functions that will conflict when included in one file
else else
@ -90,7 +90,7 @@ else
HAVE_RWAV = 1 HAVE_RWAV = 1
#HAVE_NETWORKING = 1 #HAVE_NETWORKING = 1
#HAVE_CHEEVOS = 1 #HAVE_CHEEVOS = 1
HAVE_SOCKET_LEGACY = 1 #HAVE_SOCKET_LEGACY = 1
HAVE_THREADS = 1 HAVE_THREADS = 1
#HAVE_SSL = 1 #HAVE_SSL = 1
#HAVE_BUILTINMBEDTLS = 1 #HAVE_BUILTINMBEDTLS = 1

6
network/natt.c
View File

@ -30,6 +30,10 @@
#include "natt.h" #include "natt.h"
#if defined(AF_INET6) && !defined(HAVE_SOCKET_LEGACY) && !defined(_3DS)
#define HAVE_INET6 1
#endif
static bool translate_addr(struct sockaddr_in *addr, static bool translate_addr(struct sockaddr_in *addr,
char *host, size_t hostlen, char *port, size_t portlen) char *host, size_t hostlen, char *port, size_t portlen)
{ {
@ -67,7 +71,7 @@ static bool translate_addr(struct sockaddr_in *addr,
static bool addr_6to4(struct sockaddr_storage *addr) static bool addr_6to4(struct sockaddr_storage *addr)
{ {
#if defined(AF_INET6) && !defined(HAVE_SOCKET_LEGACY) #if defined(HAVE_INET6)
/* ::ffff:a.b.c.d */ /* ::ffff:a.b.c.d */
static const uint16_t preffix[] = {0,0,0,0,0,0xffff}; static const uint16_t preffix[] = {0,0,0,0,0,0xffff};
uint32_t address; uint32_t address;

2
network/netplay/netplay_frontend.c
View File

@ -78,7 +78,7 @@
#include "netplay_private.h" #include "netplay_private.h"
#if defined(AF_INET6) && !defined(HAVE_SOCKET_LEGACY) #if defined(AF_INET6) && !defined(HAVE_SOCKET_LEGACY) && !defined(_3DS)
#define HAVE_INET6 1 #define HAVE_INET6 1
#endif #endif