--- a/NonPositionableExternalStream.st	Thu Feb 22 16:27:19 2007 +0100
+++ b/NonPositionableExternalStream.st	Thu Feb 22 16:27:35 2007 +0100
@@ -26,6 +26,16 @@
 # define _STDIO_H_INCLUDED_
 #endif
 
+#ifndef REMOVE_LATER
+# define __win32_stdout()        stdout
+# define __win32_stderr()        stderr
+# define __win32_stdin()         stdin
+#else
+    extern FILE *__win32_stdin();
+    extern FILE *__win32_stderr();
+    extern FILE *__win32_stdout();
+#endif
+
 %}
 
 ! !
@@ -363,7 +373,6 @@
 
 %{
 #ifdef WIN32
-    extern FILE *__win32_stderr();
     RETURN ( __MKOBJ( __win32_stderr() ));
 #else
     RETURN ( __MKOBJ(stderr) );
@@ -378,7 +387,6 @@
 
 %{
 #ifdef WIN32
-    extern FILE *__win32_stdin();
     RETURN ( __MKOBJ( __win32_stdin() ));
 #else
     RETURN ( __MKOBJ(stdin) );
@@ -393,7 +401,6 @@
 
 %{
 #ifdef WIN32
-    extern FILE *__win32_stdout();
     RETURN ( __MKOBJ( __win32_stdout() ));
 #else
     RETURN ( __MKOBJ(stdout) );
@@ -540,5 +547,5 @@
 !NonPositionableExternalStream class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/NonPositionableExternalStream.st,v 1.53 2007-01-23 17:21:57 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/NonPositionableExternalStream.st,v 1.54 2007-02-22 15:27:35 cg Exp $'
 ! !