diff --git a/Makefile.ps3.salamander b/Makefile.ps3.salamander index 67c7b99bee..2ace35ff76 100644 --- a/Makefile.ps3.salamander +++ b/Makefile.ps3.salamander @@ -37,7 +37,9 @@ PPU_SRCS = frontend/frontend_salamander.c \ ifeq ($(HAVE_LOGGER), 1) PPU_CFLAGS += -DHAVE_LOGGER -PPU_SRCS += netlogger.c +PPU_SRCS += netlogger.c \ + libretro-common/net/net_compat.c \ + libretro-common/net/net_socket.c endif PPU_TARGET = retroarch-salamander_ps3.elf diff --git a/Makefile.wii.salamander b/Makefile.wii.salamander index e5c8ba96be..5601f19455 100644 --- a/Makefile.wii.salamander +++ b/Makefile.wii.salamander @@ -60,7 +60,9 @@ OBJ = frontend/frontend_salamander.o \ ifeq ($(HAVE_LOGGER), 1) CFLAGS += -DHAVE_LOGGER CFLAGS += -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) -OBJ += logger/netlogger.o +OBJ += logger/netlogger.o \ + libretro-common/net/net_compat.o \ + libretro-common/net/net_socket.o endif ifeq ($(HAVE_FILE_LOGGER), 1) diff --git a/netlogger.c b/netlogger.c index ce04dc0476..3ac05fdd87 100644 --- a/netlogger.c +++ b/netlogger.c @@ -25,6 +25,7 @@ #include #include +#include #include "verbosity.h" @@ -40,9 +41,9 @@ static int g_sid; static struct sockaddr_in target; static char sendbuf[4096]; #ifdef VITA -static void *net_memory = NULL; #define NET_INIT_SIZE 512*1024 #endif +static void *net_memory = NULL; static int network_interface_up(struct sockaddr_in *target, int index, const char *ip_address, unsigned udp_port, int *s) @@ -113,24 +114,17 @@ static int network_interface_up(struct sockaddr_in *target, int index, static int network_interface_down(struct sockaddr_in *target, int *s) { - int ret = 0; -#if defined(_WIN32) && !defined(_XBOX360) - /* WinSock has headers from the stone age. */ - ret = closesocket(*s); -#elif defined(__CELLOS_LV2__) - ret = socketclose(*s); -#elif defined(VITA) - if (net_memory) - free(net_memory); - sceNetSocketClose(*s); -#else - ret = close(*s); -#endif + int ret = socket_close(*s); + #if defined(__CELLOS_LV2__) && !defined(__PSL1GHT__) cellNetCtlTerm(); #elif defined(GEKKO) && !defined(HW_DOL) net_deinit(); #endif + + if (net_memory) + free(net_memory); + return ret; }