diff -ur aspell-0.50.3.org/common/info.cpp aspell-0.50.3/common/info.cpp
--- aspell-0.50.3.org/common/info.cpp	Mon Aug 12 23:10:18 2002
+++ aspell-0.50.3/common/info.cpp	Sun Nov 24 10:06:14 2002
@@ -31,6 +31,10 @@
 #include "stack_ptr.hpp"
 #include "strtonum.hpp"
 
+#ifdef ERROR
+# undef ERROR
+#endif
+
 namespace acommon {
 
   class Dir {
diff -ur aspell-0.50.3.org/common/iostream.hpp aspell-0.50.3/common/iostream.hpp
--- aspell-0.50.3.org/common/iostream.hpp	Tue Aug 27 11:51:38 2002
+++ aspell-0.50.3/common/iostream.hpp	Sun Nov 24 18:14:24 2002
@@ -9,7 +9,7 @@
 
 #include "fstream.hpp"
 
-#if defined(__CYGWIN__) || defined (_WIN32)
+#if defined(__CYGWIN__)
 #define DLLIMPORT __declspec(dllimport)
 #else
 #define DLLIMPORT
diff -ur aspell-0.50.3.org/modules/speller/default/readonly_ws.cpp aspell-0.50.3/modules/speller/default/readonly_ws.cpp
--- aspell-0.50.3.org/modules/speller/default/readonly_ws.cpp	Sun Mar 24 06:35:16 2002
+++ aspell-0.50.3/modules/speller/default/readonly_ws.cpp	Sun Nov 24 10:06:14 2002
@@ -101,6 +101,10 @@
 
 #endif
 
+#ifdef OUT
+# undef OUT
+#endif
+
 #ifndef MAP_FAILED 
 #define MAP_FAILED (-1)
 #endif
diff -ur aspell-0.50.3.org/prog/aspell.cpp aspell-0.50.3/prog/aspell.cpp
--- aspell-0.50.3.org/prog/aspell.cpp	Mon Nov  4 22:36:20 2002
+++ aspell-0.50.3/prog/aspell.cpp	Sun Nov 24 18:30:24 2002
@@ -60,6 +60,12 @@
 void repl();
 void soundslike();
 
+#ifdef WIN32
+# define STDIOBUFSIZE 2
+#else
+# define STDIOBUFSIZE 0
+#endif
+
 #define EXIT_ON_ERR(command) \
   do{PosibErrBase pe(command);\
   if(pe.has_err()){CERR<<"Error: "<< pe.get_err()->mesg << "\n"; exit(1);}\
@@ -455,8 +461,8 @@
 void pipe() 
 {
   // set up stdin and stdout to be line buffered
-  assert(setvbuf(stdin, 0, _IOLBF, 0) == 0); 
-  assert(setvbuf(stdout, 0, _IOLBF, 0) == 0);
+  assert(setvbuf(stdin, 0, _IOLBF, STDIOBUFSIZE) == 0); 
+  assert(setvbuf(stdout, 0, _IOLBF, STDIOBUFSIZE) == 0);
 
   bool terse_mode = true;
   bool do_time = options->retrieve_bool("time");