--- a/FileStream.st	Fri Jan 19 00:24:16 2007 +0100
+++ b/FileStream.st	Fri Jan 19 01:03:13 2007 +0100
@@ -46,16 +46,6 @@
 # define fileno(f)      ((f->__fileH << 8) | (f->__fileL))
 #endif
 
-#ifndef SEEK_SET
-# define SEEK_SET       0
-#endif
-#ifndef SEEK_CUR
-# define SEEK_CUR       1
-#endif
-#ifndef SEEK_END
-# define SEEK_END       2
-#endif
-
 #ifdef __VMS__
 # include <rms.h>
 #endif
@@ -81,6 +71,7 @@
 # undef Context
 # undef Message
 # undef Process
+# undef Processor
 
 # define NOATOM
 # define NOGDICAPMASKS
@@ -97,10 +88,13 @@
 
 # include <windows.h>
 # include <winsock.h> /* */
-# include <io.h>
 
 # if !defined(__BORLANDC__)
+#  define lseek _lseek
 #  define stat _stat
+#  define MAXPATHLEN 1024
+# else
+#  include <io.h>
 # endif
 
 # ifdef __DEF_Array
@@ -142,6 +136,9 @@
 # ifdef __DEF_Process
 #  define Process __DEF_Process
 # endif
+# ifdef __DEF_Processor
+#  define Processor __DEF_Processor
+# endif
 
 # define INT int
 
@@ -171,6 +168,16 @@
 
 #include "stxOSDefs.h"
 
+#ifndef SEEK_SET
+# define SEEK_SET       0
+#endif
+#ifndef SEEK_CUR
+# define SEEK_CUR       1
+#endif
+#ifndef SEEK_END
+# define SEEK_END       2
+#endif
+
 %}
 ! !
 
@@ -1449,7 +1456,7 @@
 !FileStream class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/FileStream.st,v 1.122 2005-12-19 16:14:22 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/FileStream.st,v 1.123 2007-01-19 00:03:12 stefan Exp $'
 ! !
 
 FileStream initialize!