--- a/NonPositionableExternalStream.st Sat May 02 07:04:02 2015 +0200
+++ b/NonPositionableExternalStream.st Mon May 04 07:11:22 2015 +0200
@@ -348,10 +348,14 @@
"return a stderr handle"
%{
-#ifdef WIN32
+#ifdef __SCHTEAM__
+ return context._RETURN( StandardErrorStream );
+#else
+# ifdef WIN32
RETURN ( __MKEXTERNALADDRESS( __win32_stderr() ));
-#else
+# else
RETURN ( __MKEXTERNALADDRESS(stderr) );
+# endif
#endif
%}
!
@@ -362,10 +366,14 @@
"return a stdin handle"
%{
-#ifdef WIN32
+#ifdef __SCHTEAM__
+ return context._RETURN( StandardInputStream );
+#else
+# ifdef WIN32
RETURN ( __MKEXTERNALADDRESS( __win32_stdin() ));
-#else
+# else
RETURN ( __MKEXTERNALADDRESS(stdin) );
+# endif
#endif
%}
!
@@ -376,10 +384,14 @@
"return a stdout handle"
%{
-#ifdef WIN32
+#ifdef __SCHTEAM__
+ return context._RETURN( StandardOutputStream );
+#else
+# ifdef WIN32
RETURN ( __MKEXTERNALADDRESS( __win32_stdout() ));
-#else
+# else
RETURN ( __MKEXTERNALADDRESS(stdout) );
+# endif
#endif
%}
!
@@ -549,8 +561,8 @@
count := stop-start+1.
count ~= (self nextPutBytes:count from:aCollection startingAt:start) ifTrue:[
- "incomplete write"
- self writeError.
+ "incomplete write"
+ self writeError.
].
!
@@ -564,16 +576,16 @@
wasBlocking := self blocking:false.
[remaining ~~ 0] whileTrue:[
- |count|
+ |count|
- count := super nextPutBytes:remaining from:buffer startingAt:offset.
+ count := super nextPutBytes:remaining from:buffer startingAt:offset.
- remaining := remaining - count.
- offset := offset + count.
- remaining ~~ 0 ifTrue:[
- "Transcript showCR:'writeWait'."
- self writeWait.
- ].
+ remaining := remaining - count.
+ offset := offset + count.
+ remaining ~~ 0 ifTrue:[
+ "Transcript showCR:'writeWait'."
+ self writeWait.
+ ].
].
wasBlocking ifTrue:[self blocking:true].
@@ -583,10 +595,10 @@
!NonPositionableExternalStream class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/NonPositionableExternalStream.st,v 1.73 2015-03-24 16:17:21 stefan Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/NonPositionableExternalStream.st,v 1.74 2015-05-03 12:39:22 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libbasic/NonPositionableExternalStream.st,v 1.73 2015-03-24 16:17:21 stefan Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/NonPositionableExternalStream.st,v 1.74 2015-05-03 12:39:22 cg Exp $'
! !