--- a/Socket.st	Sat Feb 27 06:57:07 2016 +0100
+++ b/Socket.st	Sun Feb 28 06:51:21 2016 +0100
@@ -49,7 +49,7 @@
 // linger.onoff=off linger.time= *irrelevant*
 //# define SET_LINGER_WHEN_CREATING_SOCKET
 
-# ifdef __MINGW__
+# ifdef __xxMINGW__
 extern HANDLE _get_osfhandle();
 # endif
 
@@ -2131,7 +2131,11 @@
     int a;
     INT ret;
     int oldFlags;
+# ifdef __MINGW64__
+    unsigned long on = 1;
+# else
     int on = 1;
+#endif
     int sockaddr_size;
 
     if (!__isNonNilObject(aSocketAddress) || !__isBytes(aSocketAddress)) {
@@ -4192,4 +4196,3 @@
 version_CVS
     ^ '$Header$'
 ! !
-