Index: compress_bz.cc
===================================================================
RCS file: /home/max/cvsmirror/cygwin-apps-cvs/setup/compress_bz.cc,v
retrieving revision 2.5
diff -u -p -r2.5 compress_bz.cc
--- compress_bz.cc	2002/06/27 11:48:42	2.5
+++ compress_bz.cc	2002/10/30 00:16:50
@@ -32,6 +32,9 @@ static const char *cvsid =
 #include "compress.h"
 #include "compress_bz.h"
 #undef _WIN32
+/* If we are going to hide the fact that we are _WIN32 from bzlib,
+   then we need to #undef small for it as well (bad windows.h clash). */
+#undef small
 #include "bzlib.h"
 
 compress_bz::compress_bz (io_stream * parent) : peeklen (0), position (0)
Index: compress_bz.h
===================================================================
RCS file: /home/max/cvsmirror/cygwin-apps-cvs/setup/compress_bz.h,v
retrieving revision 2.5
diff -u -p -r2.5 compress_bz.h
--- compress_bz.h	2002/06/27 11:48:42	2.5
+++ compress_bz.h	2002/10/30 00:17:06
@@ -21,6 +21,9 @@
 
 #ifdef _WIN32
 #undef _WIN32
+/* If we are going to hide the fact that we are _WIN32 from bzlib,
+   then we need to #undef small for it as well (bad windows.h clash). */
+#undef small
 #include <bzlib.h>
 #define _WIN32
 #else