Windows: Use winsock2.h throughout. Prevent accidental include of old winsock.h

windows/JackNetWinSocket.h

@@ -21,7 +21,7 @@
 #define __JackNetWinSocket__
 
 #include "JackNetSocket.h"
-#ifdef __MINGW32__
+#ifdef WIN32
 #include <winsock2.h>
 #include <ws2tcpip.h>
 #include <stdint.h>

wscript

@@ -209,6 +209,7 @@ def configure(conf):
     if conf.env['IS_WINDOWS']:
         conf.env.append_unique('CCDEFINES', '_POSIX')
         conf.env.append_unique('CXXDEFINES', '_POSIX')
+        conf.env.append_unique('DEFINES', ['_WINSOCKAPI_'])
 
     conf.env.append_unique('CXXFLAGS', '-Wall')
     conf.env.append_unique('CXXFLAGS', '-std=gnu++11')