From 04a15b676bd7cdc8fa60ebbbc3c16ec945e80ca4 Mon Sep 17 00:00:00 2001 From: Ulrich Alt Date: Fri, 14 Aug 2015 10:22:41 +0200 Subject: [PATCH] Make zbackup compile in cygwin --- .gitignore | 1 + file.cc | 6 +++--- unbuffered_file.cc | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 18efb1c..80da0a4 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ cmake_install.cmake /zbackup.pb.cc /zbackup.pb.h /zbackup +/zbackup.exe diff --git a/file.cc b/file.cc index 290d48a..7af0201 100644 --- a/file.cc +++ b/file.cc @@ -6,7 +6,7 @@ #include #include #include -#if defined( __APPLE__ ) || defined( __OpenBSD__ ) || defined(__FreeBSD__) +#if defined( __APPLE__ ) || defined( __OpenBSD__ ) || defined(__FreeBSD__) || defined(__CYGWIN__) #include #else #include @@ -70,7 +70,7 @@ void File::rename( std::string const & from, #if defined( __APPLE__ ) if ( -1 == sendfile( write_fd, read_fd, offset, &stat_buf.st_size, NULL, 0 ) ) throw exCantRename( from + " to " + to ); - #elif defined( __OpenBSD__ ) || defined(__FreeBSD__) + #elif defined( __OpenBSD__ ) || defined(__FreeBSD__) || defined(__CYGWIN__) size_t BUFSIZE = 4096, size; char buf[BUFSIZE]; @@ -249,7 +249,7 @@ char * File::gets( char * s, int size, bool stripNl ) if ( result && stripNl ) { size_t len = strlen( result ); - + char * last = result + len; while( len-- ) diff --git a/unbuffered_file.cc b/unbuffered_file.cc index 14d6f66..db995e6 100644 --- a/unbuffered_file.cc +++ b/unbuffered_file.cc @@ -13,7 +13,7 @@ #include "unbuffered_file.hh" -#if defined( __APPLE__ ) || defined( __OpenBSD__ ) || defined(__FreeBSD__) +#if defined( __APPLE__ ) || defined( __OpenBSD__ ) || defined(__FreeBSD__) || defined(__CYGWIN__) #define lseek64 lseek #endif @@ -24,7 +24,7 @@ UnbufferedFile::UnbufferedFile( char const * fileName, Mode mode ) int flags = ( mode == WriteOnly ? ( O_WRONLY | O_CREAT | O_TRUNC ) : O_RDONLY ); -#if !defined( __APPLE__ ) && !defined( __OpenBSD__ ) && !defined(__FreeBSD__) +#if !defined( __APPLE__ ) && !defined( __OpenBSD__ ) && !defined(__FreeBSD__) && !defined(__CYGWIN__) flags |= O_LARGEFILE; #endif fd = open( fileName, flags, 0666 );