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"
#include "archive.h"
#include "archive_tar.h"
#include "log.h"
-#include "concat.h"
#include "port.h"
{
/* 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;
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