diff --git a/Core/HLE/proAdhoc.cpp b/Core/HLE/proAdhoc.cpp index fe446c68e8..3bccf310db 100644 --- a/Core/HLE/proAdhoc.cpp +++ b/Core/HLE/proAdhoc.cpp @@ -312,11 +312,7 @@ int friendFinder(){ SceNetAdhocctlChatPacketS2C * packet = (SceNetAdhocctlChatPacketS2C *)rx; // Fix for Idiots that try to troll the "ME" Nametag -#ifdef _MSC_VER - if(stricmp((char *)packet->name.data, "ME") == 0) strcpy((char *)packet->name.data, "NOT ME"); -#else if(strcasecmp((char *)packet->name.data, "ME") == 0) strcpy((char *)packet->name.data, "NOT ME"); -#endif // Add Incoming Chat to HUD //printf("Receive chat message %s", packet->base.message); diff --git a/Core/HLE/sceNetAdhoc.cpp b/Core/HLE/sceNetAdhoc.cpp index f82631f34b..ef39c7f3f9 100644 --- a/Core/HLE/sceNetAdhoc.cpp +++ b/Core/HLE/sceNetAdhoc.cpp @@ -1202,19 +1202,11 @@ int sceNetAdhocPtpAccept(int id, u32 peerMacAddrPtr, u32 peerPortPtr, int timeou // Address Information sockaddr_in peeraddr; memset(&peeraddr, 0, sizeof(peeraddr)); -#if defined(_MSC_VER) || defined(ANDROID) - int peeraddrlen = sizeof(peeraddr); -#else - uint32_t peeraddrlen = sizeof(peeraddr); -#endif + socklen_t peeraddrlen = sizeof(peeraddr); // Local Address Information sockaddr_in local; memset(&local, 0, sizeof(local)); -#if defined(_MSC_VER) || defined(ANDROID) - int locallen = sizeof(local); -#else - uint32_t locallen = sizeof(local); -#endif + socklen_t locallen = sizeof(local); // Grab Nonblocking Flag uint32_t nbio = getBlockingFlag(socket->id); @@ -1233,7 +1225,7 @@ int sceNetAdhocPtpAccept(int id, u32 peerMacAddrPtr, u32 peerPortPtr, int timeou uint32_t starttime = (uint32_t)(real_time_now()*1000.0); // Retry until Timeout hits - while((timeout == 0 ||((uint32_t)(real_time_now()*1000.0) - starttime) < timeout) && newsocket == -1) { + while((timeout == 0 ||((uint32_t)(real_time_now()*1000.0) - starttime) < (uint32_t)timeout) && newsocket == -1) { // Accept Connection newsocket = accept(socket->id, (sockaddr *)&peeraddr, &peeraddrlen); @@ -1406,15 +1398,9 @@ int sceNetAdhocPtpConnect(int id, int timeout, int flag) { // Peer Information (for Connection-Polling) sockaddr_in peer; memset(&peer, 0, sizeof(peer)); -#if defined(_MSC_VER) || defined(ANDROID) - int peerlen = sizeof(peer); -#else - uint32_t peerlen = sizeof(peer); -#endif + socklen_t peerlen = sizeof(peer); // Wait for Connection - while((timeout == 0 || ( (uint32_t)(real_time_now()*1000.0) - starttime) < (uint32_t)timeout) - && getpeername(socket->id, (sockaddr *)&peer, &peerlen) != 0) - { + while((timeout == 0 || ( (uint32_t)(real_time_now()*1000.0) - starttime) < (uint32_t)timeout) && getpeername(socket->id, (sockaddr *)&peer, &peerlen) != 0) { // Wait 1ms sleep_ms(1); }