Index: archive_tar_file.cc
===================================================================
RCS file: /home/max/cvsmirror/cygwin-apps-cvs/setup/archive_tar_file.cc,v
retrieving revision 2.5
diff -u -p -r2.5 archive_tar_file.cc
--- archive_tar_file.cc	2002/05/05 04:02:00	2.5
+++ archive_tar_file.cc	2002/11/01 22:39:17
@@ -20,6 +20,7 @@ static const char *cvsid = "\n%%% $Id: a
 #endif
 
 #include <errno.h>
+#include <algorithm>
 
 #include "zlib/zlib.h"
 #include "io_stream.h"
@@ -45,7 +46,7 @@ ssize_t archive_tar_file::read (void *bu
 {
   /* how many bytes do we want to give the user */
   int
-    want = min (len, state.file_length - state.file_offset);
+    want = std::min (len, state.file_length - state.file_offset);
   /* how many do we need to read after that to line up the file pointer */
   int
     roundup = (512 - (want % 512)) % 512;
@@ -84,7 +85,7 @@ ssize_t archive_tar_file::write (const v
 ssize_t archive_tar_file::peek (void *buffer, size_t len)
 {
   int
-    want = min (len, state.file_length - state.file_offset);
+    want = std::min (len, state.file_length - state.file_offset);
   if (want)
     {
       ssize_t
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/11/01 22:39:26
@@ -22,6 +22,7 @@ static const char *cvsid =
   "\n%%% $Id: compress_bz.cc,v 2.5 2002/06/27 11:48:42 rbcollins Exp $\n";
 #endif
 
+#include <algorithm>
 #include "win32.h"
 #include <stdio.h>
 #include <errno.h>
@@ -73,7 +74,7 @@ compress_bz::read (void *buffer, size_t 
 
   if (peeklen)
   {
-    ssize_t tmplen = min (peeklen, len);
+    ssize_t tmplen = std::min (peeklen, len);
     peeklen -= tmplen;
     memcpy (buffer, peekbuf, tmplen);
     memmove (peekbuf, peekbuf + tmplen, tmplen);
Index: compress_gz.cc
===================================================================
RCS file: /home/max/cvsmirror/cygwin-apps-cvs/setup/compress_gz.cc,v
retrieving revision 2.6
diff -u -p -r2.6 compress_gz.cc
--- compress_gz.cc	2002/07/05 01:59:34	2.6
+++ compress_gz.cc	2002/11/01 22:39:33
@@ -23,6 +23,7 @@ static const char *cvsid =
   "\n%%% $Id: compress_gz.cc,v 2.6 2002/07/05 01:59:34 rbcollins Exp $\n";
 #endif
 
+#include <algorithm>
 #include "win32.h"
 #include <stdio.h>
 #include <stdlib.h>
@@ -230,7 +231,7 @@ compress_gz::read (void *buffer, size_t 
 
   if (peeklen)
     {
-      ssize_t tmplen = min (peeklen, len);
+      ssize_t tmplen = std::min (peeklen, len);
       peeklen -= tmplen;
       memcpy (buffer, peekbuf, tmplen);
       memmove (peekbuf, peekbuf + tmplen, tmplen);