--- a/Socket.st	Sun Jan 10 18:28:09 1999 +0100
+++ b/Socket.st	Fri Jan 15 22:21:21 1999 +0100
@@ -38,13 +38,22 @@
 # undef Object
 #endif
 
-#ifdef __openVMS__
-# undef __new
+#if defined(__openVMS__) || defined(LINUX)
+  /* 
+   * mhmh - used in stdio ...
+   * (new linuxes)
+   */
+# undef __new   
+# define __NEED_REDEF_new__
 #endif
 
 #include <stdio.h>
 #include <errno.h>
 
+#ifdef __NEED_REDEF_new__
+# define __new  __STX___new
+#endif
+
 #define UNIX_LIKE
 
 #if defined(MSWINDOWS) || defined(OS2) || defined(MSDOS) || defined(WIN32)
@@ -85,10 +94,6 @@
 #endif
 
 #ifdef LINUX
-/* use inline string macros ... */
-# define __STRINGDEFS__
-# include <linuxIntern.h>
-
 /* kludge to avoid some redefines ... */
 # define _ARPA_NAMESER_H
 # define _NETINET_TCP_H
@@ -138,6 +143,7 @@
 # if !defined(NO_SOCKET)
 #  include <fcntl.h>
 #  include <sys/types.h>
+#  define _SYS_TYPES_H_INCLUDED_
 
 #  if defined(IRIS) && !defined(IRIX5)
     /* no socket.h on 4.0.5h ?!?!? */
@@ -348,7 +354,11 @@
 
 # ifdef AF_INET
 #  include <netdb.h>
-#  include <netinet/in.h>
+#  if defined(LINUX) && defined(AF_INET6)
+#   include <linux/in.h>
+#  else
+#   include <netinet/in.h>
+#  endif
 #  if ! (defined(SYSV3) && defined(mc88k))
 #   include <netinet/tcp.h>
 #  endif
@@ -360,6 +370,7 @@
 
 # ifdef AF_APPLETALK
 #  ifdef LINUX
+#   include <asm/types.h>
 #   include <linux/atalk.h>
 #  endif
 # endif
@@ -383,6 +394,12 @@
 # endif
 #endif
 
+#ifdef xxLINUX
+/* use inline string macros ... */
+# define __STRINGDEFS__
+# include <linuxIntern.h>
+#endif
+
 /*
  * gethostbyname seems to have trouble
  * sometimes, if interrupted while a request
@@ -4156,5 +4173,5 @@
 !Socket class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic2/Socket.st,v 1.112 1998-12-17 13:24:26 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic2/Socket.st,v 1.113 1999-01-15 21:20:59 cg Exp $'
 ! !