ws2_32: Win64 printf format fixes.

dlls/ws2_32/Makefile.in

-EXTRADEFS = -DUSE_WS_PREFIX -DWINE_NO_LONG_AS_INT
+EXTRADEFS = -DUSE_WS_PREFIX
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@

dlls/ws2_32/async.c

@@ -767,7 +767,7 @@ INT WINAPI WSApSetPostRoutine(LPWPUPOSTMESSAGE lpPostRoutine)
 WSAEVENT WINAPI WPUCompleteOverlappedRequest(SOCKET s, LPWSAOVERLAPPED overlapped,
                                              DWORD error, DWORD transferred, LPINT errcode)
 {
-    FIXME("(0x%08x,%p,0x%08lx,0x%08lx,%p), stub !\n", s, overlapped, error, transferred, errcode);
+    FIXME("(0x%08x,%p,0x%08x,0x%08x,%p), stub !\n", s, overlapped, error, transferred, errcode);
 
     if (errcode)
         *errcode = WSAEINVAL;

include/winsock.h

@@ -115,13 +115,21 @@
 typedef unsigned char  WS_u_char;
 typedef unsigned short WS_u_short;
 typedef unsigned int   WS_u_int;
+#ifdef _MSC_VER
 typedef unsigned long  WS_u_long;
+#else
+typedef unsigned int   WS_u_long;
+#endif
 #elif (defined(_MSC_VER) || defined(__MINGW_H) || defined(__WATCOMC__)) && !defined(_BSDTYPES_DEFINED)
 /* MinGW doesn't define the u_xxx types */
-typedef unsigned char u_char;
+typedef unsigned char  u_char;
 typedef unsigned short u_short;
-typedef unsigned int  u_int;
-typedef unsigned long u_long;
+typedef unsigned int   u_int;
+#ifdef _MSC_VER
+typedef unsigned long  u_long;
+#else
+typedef unsigned int   u_long;
+#endif
 #define _BSDTYPES_DEFINED
 #endif