X-Git-Url: https://cygwin.com/git/?a=blobdiff_plain;f=archive_tar_file.cc;h=dbf84d73fce7df93c31d1dd05f4da9b4d2dcc9ee;hb=f37b36a368e8534c216e5f0096b02a15eaee3dbe;hp=2deaf9d4b9199713a41423229000869665e33664;hpb=1ac649ed7e226735967a47d45f394b3569e4bbad;p=cygwin-apps%2Fsetup.git

diff --git a/archive_tar_file.cc b/archive_tar_file.cc
index 2deaf9d4..dbf84d73 100644
--- a/archive_tar_file.cc
+++ b/archive_tar_file.cc
@@ -19,12 +19,8 @@
 static const char *cvsid = "\n%%% $Id$\n";
 #endif
 
-#include "win32.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/fcntl.h>
 #include <errno.h>
+#include <algorithm>
 
 #include "zlib/zlib.h"
 #include "io_stream.h"
@@ -50,7 +46,7 @@ ssize_t archive_tar_file::read (void *buffer, size_t len)
 {
   /* 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;
@@ -89,7 +85,7 @@ ssize_t archive_tar_file::write (const void *buffer, size_t len)
 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