--- a/ExternalStream.st	Tue Jan 16 10:49:04 2007 +0100
+++ b/ExternalStream.st	Tue Jan 16 11:38:24 2007 +0100
@@ -27,6 +27,8 @@
 !ExternalStream primitiveDefinitions!
 %{
 
+#undef fwrite
+
 #include <stdio.h>
 #define _STDIO_H_INCLUDED_
 
@@ -2557,8 +2559,8 @@
 	    __WRITING__(f)
 	}
 #ifdef WIN32
-	if ((f == stdout) || (f == stderr)) {
-	    cnt = fwrite(__stringVal(aString), 1, len, f);
+	if ((f == __win32_stdout()) || (f == __win32_stderr())) {
+	    cnt = __win32_fwrite(__stringVal(aString), 1, len, f);
 	} else
 #endif
 	{
@@ -2582,8 +2584,8 @@
 		cp = "\n"; len = 1;
 	    }
 #ifdef WIN32
-	    if ((f == stdout) || (f == stderr)) {
-		cnt = fwrite(cp, 1, len, f);
+	    if ((f == __win32_stdout()) || (f == __win32_stderr())) {
+		cnt = __win32_fwrite(cp, 1, len, f);
 	    } else
 #endif
 	    {
@@ -3762,8 +3764,8 @@
 	    __WRITING__(f)
 	}
 #ifdef WIN32
-	if ((f == stdout) || (f == stderr)) {
-	    cnt = fwrite(&c, 1, 1, f);
+	if ((f == __win32_stdout()) || (f == __win32_stderr())) {
+	    cnt = __win32_fwrite(&c, 1, 1, f);
 	} else
 #endif
 	{
@@ -5634,8 +5636,8 @@
 	    }
 	}
 #ifdef WIN32
-	if ((f == stdout) || (f == stderr)) {
-	    cnt = fwrite(cp, 1, len, f);
+	if ((f == __win32_stdout()) || (f == __win32_stderr())) {
+	    cnt = __win32_fwrite(cp, 1, len, f);
 	} else
 #endif
 	{
@@ -5679,8 +5681,8 @@
 	    if (__INST(buffered) == true) {
 		FILEPOINTER f = __FILEVal(fp);
 #ifdef WIN32
-		if ((f == stdout) || (f == stderr)) {
-		    fflush(f);
+		if ((f == __win32_stdout()) || (f == __win32_stderr())) {
+		    __win32_fflush(f);
 		} else
 #endif
 		{
@@ -5736,8 +5738,8 @@
 			__WRITING__(f)
 		    }
 #ifdef WIN32
-		    if ((f == stdout) || (f == stderr)) {
-			cnt = fwrite(&c, 1, 1, f);
+		    if ((f == __win32_stdout()) || (f == __win32_stderr())) {
+			cnt = __win32_fwrite(&c, 1, 1, f);
 		    } else
 #endif
 		    __WRITEBYTE__(cnt, f, &c, _buffered);
@@ -5815,8 +5817,8 @@
 	if (__isString(aCollection) || __isSymbol(aCollection)) {
 	    len = __stringSize(aCollection);
 #ifdef WIN32
-	    if ((f == stdout) || (f == stderr)) {
-		cnt = fwrite(__stringVal(aCollection), 1, len, f);
+	    if ((f == __win32_stdout()) || (f == __win32_stderr())) {
+		cnt = __win32_fwrite(__stringVal(aCollection), 1, len, f);
 	    } else
 #endif
 	    {
@@ -5836,8 +5838,8 @@
 		} else
 		    goto out;
 #ifdef WIN32
-		if ((f == stdout) || (f == stderr)) {
-		    cnt = fwrite(__stringVal(aCollection), 1, len, f);
+		if ((f == __win32_stdout()) || (f == __win32_stderr())) {
+		    cnt = __win32_fwrite(__stringVal(aCollection), 1, len, f);
 		} else
 #endif
 		{
@@ -5905,8 +5907,8 @@
 		iStop = len;
 	    len = iStop - iStart + 1;
 #ifdef WIN32
-	    if ((f == stdout) || (f == stderr)) {
-		cnt = fwrite(__stringVal(aCollection)+iStart-1, 1, len, f);
+	    if ((f == __win32_stdout()) || (f == __win32_stderr())) {
+		cnt = __win32_fwrite(__stringVal(aCollection)+iStart-1, 1, len, f);
 	    } else
 #endif
 	    {
@@ -5934,8 +5936,8 @@
 		len = iStop - iStart + 1;
 		offs += iStart - 1;
 #ifdef WIN32
-		if ((f == stdout) || (f == stderr)) {
-		    cnt = fwrite(__stringVal(aCollection)+iStart-1, 1, len, f);
+		if ((f == __win32_stdout()) || (f == __win32_stderr())) {
+		    cnt = __win32_fwrite(__stringVal(aCollection)+iStart-1, 1, len, f);
 		} else
 #endif
 		{
@@ -5967,7 +5969,7 @@
 !ExternalStream class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/ExternalStream.st,v 1.297 2005-12-23 16:25:53 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/ExternalStream.st,v 1.298 2007-01-16 10:38:24 cg Exp $'
 ! !
 
 ExternalStream initialize!