--- a/Socket.st	Thu Nov 21 19:34:16 1996 +0100
+++ b/Socket.st	Thu Nov 21 19:34:50 1996 +0100
@@ -30,7 +30,12 @@
 # undef Number
 # undef Method
 # undef Point
-# undef Rectangle
+# undef Rectangle
+# undef Block
+# undef Context
+# undef String
+# undef Message
+# undef Object
 #endif
 
 #include <stdio.h>
@@ -50,7 +55,8 @@
 # define _NETINET_TCP_H
 #endif
 
-#ifdef WIN32
+#ifdef WIN32
+
 # include <WINSOCK.H>
 
 # ifdef __DEF_Array
@@ -64,7 +70,22 @@
 # endif
 # ifdef __DEF_Point
 #  define Point __DEF_Point
-# endif
+# endif
+# ifdef __DEF_Block
+#  define Block __DEF_Block
+# endif
+# ifdef __DEF_Context
+#  define Context __DEF_Context
+# endif
+# ifdef __DEF_String
+#  define String __DEF_String
+# endif
+# ifdef __DEF_Message
+#  define Message __DEF_Message
+# endif
+# ifdef __DEF_Object
+#  define Object __DEF_Object
+# endif
 
 #else
 
@@ -140,7 +161,9 @@
 #endif
 
 #ifdef AF_UNIX
-# include <sys/un.h>
+# ifndef WIN32
+#  include <sys/un.h>
+# endif
 #endif
 
 /*
@@ -2576,5 +2599,5 @@
 !Socket  class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic2/Socket.st,v 1.71 1996-10-02 11:36:37 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic2/Socket.st,v 1.72 1996-11-21 18:34:50 cg Exp $'
 ! !