From ade18848f79bcfaa087e232070e19d022a760557 Mon Sep 17 00:00:00 2001
From: Henrik Rydgard <hrydgard@gmail.com>
Date: Thu, 28 Nov 2013 11:54:00 +0100
Subject: [PATCH] Warning fixes

---
 Core/HLE/proAdhoc.cpp    | 4 ++--
 Core/HLE/proAdhoc.h      | 4 ++++
 Core/HLE/sceNetAdhoc.cpp | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Core/HLE/proAdhoc.cpp b/Core/HLE/proAdhoc.cpp
index 3bccf310db..7ee938343f 100644
--- a/Core/HLE/proAdhoc.cpp
+++ b/Core/HLE/proAdhoc.cpp
@@ -526,11 +526,11 @@ int initNetwork(SceNetAdhocctlAdhocId *adhoc_id){
     return iResult;
   }
 #endif
-  metasocket = INVALID_SOCKET;
+  metasocket = (int)INVALID_SOCKET;
   metasocket = socket(AF_INET,SOCK_STREAM, IPPROTO_TCP);
   if(metasocket == INVALID_SOCKET){
     ERROR_LOG(SCENET,"invalid socket");
-    return INVALID_SOCKET;
+    return -1;
   }
   struct sockaddr_in server_addr;
   server_addr.sin_family = AF_INET;
diff --git a/Core/HLE/proAdhoc.h b/Core/HLE/proAdhoc.h
index 1723eb84ab..385c219c6d 100644
--- a/Core/HLE/proAdhoc.h
+++ b/Core/HLE/proAdhoc.h
@@ -37,6 +37,10 @@
 #endif
 #ifdef _MSC_VER
 #define PACK
+#undef errno
+#undef EAGAIN
+#undef EINPROGRESS
+#undef EISCONN
 #define errno WSAGetLastError()
 #define EAGAIN WSAEWOULDBLOCK
 #define EINPROGRESS WSAEWOULDBLOCK
diff --git a/Core/HLE/sceNetAdhoc.cpp b/Core/HLE/sceNetAdhoc.cpp
index ef39c7f3f9..5b2de64d44 100644
--- a/Core/HLE/sceNetAdhoc.cpp
+++ b/Core/HLE/sceNetAdhoc.cpp
@@ -229,7 +229,7 @@ int sceNetAdhocPdpCreate(const char *mac, u32 port, int bufferSize, u32 unknown)
 				//return ERROR_NET_ADHOC_PORT_IN_USE;
 
 				// Create Internet UDP Socket
-				int usocket = INVALID_SOCKET;
+				int usocket = (int)INVALID_SOCKET;
 				usocket = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
 				// Valid Socket produced
 				if(usocket != INVALID_SOCKET) {