diff --git a/rpcs3/Emu/SysCalls/Modules/sceNp.cpp b/rpcs3/Emu/SysCalls/Modules/sceNp.cpp index e024f0712e..2846199ff8 100644 --- a/rpcs3/Emu/SysCalls/Modules/sceNp.cpp +++ b/rpcs3/Emu/SysCalls/Modules/sceNp.cpp @@ -32,8 +32,8 @@ int sceNpDrmIsAvailable(u32 k_licensee_addr, u32 drm_path_addr) k_licensee_str += wxString::Format("%02x", k_licensee[i]); } - sceNp.Warning("sceNpDrmIsAvailable: Found DRM license file at %s", drm_path.c_str()); - sceNp.Warning("sceNpDrmIsAvailable: Using k_licensee 0x%s", k_licensee_str); + sceNp.Warning("sceNpDrmIsAvailable: Found DRM license file at %s", drm_path.wx_str()); + sceNp.Warning("sceNpDrmIsAvailable: Using k_licensee 0x%s", k_licensee_str.wx_str()); return CELL_OK; } diff --git a/rpcs3/Emu/SysCalls/Modules/sys_net.cpp b/rpcs3/Emu/SysCalls/Modules/sys_net.cpp index aaeb73cf19..754d7e49eb 100644 --- a/rpcs3/Emu/SysCalls/Modules/sys_net.cpp +++ b/rpcs3/Emu/SysCalls/Modules/sys_net.cpp @@ -6,7 +6,7 @@ #ifdef _WIN32 #include -#elif +#else #include #include #endif @@ -296,7 +296,11 @@ int sys_net_socket(s32 family, s32 type, s32 protocol) int sys_net_socketclose(s32 s) { sys_net.Warning("socket(s=%d)", s); +#ifdef _WIN32 int ret = closesocket(s); +#else + int ret = close(s); +#endif g_lastError = getLastError(); return ret; } @@ -321,8 +325,6 @@ int sys_net_initialize_network_ex(mem_ptr_t param) WSADATA wsaData; WORD wVersionRequested = MAKEWORD(1,1); WSAStartup(wVersionRequested, &wsaData); -#elif - // TODO ? #endif return CELL_OK; } @@ -454,8 +456,6 @@ int sys_net_finalize_network() g_lastError.SetAddr(NULL); #ifdef _WIN32 WSACleanup(); -#else - // TODO ? #endif return CELL_OK; } @@ -539,4 +539,4 @@ void sys_net_init() sys_net.AddFunc(0xc9157d30, _sys_net_h_errno_loc); sys_net.AddFunc(0xe2434507, sys_net_set_netemu_test_param); sys_net.AddFunc(0xfdb8f926, sys_net_free_thread_context); -} \ No newline at end of file +}