diff --git a/include/backtrace/BacktraceMap.h b/include/backtrace/BacktraceMap.h index b80045fe1..df48dfe2b 100644 --- a/include/backtrace/BacktraceMap.h +++ b/include/backtrace/BacktraceMap.h @@ -19,7 +19,7 @@ #include #include -#ifdef USE_MINGW +#ifdef _WIN32 // MINGW does not define these constants. #define PROT_NONE 0 #define PROT_READ 0x1 diff --git a/libsparse/output_file.c b/libsparse/output_file.c index d2847367a..6578d99b8 100644 --- a/libsparse/output_file.c +++ b/libsparse/output_file.c @@ -34,7 +34,7 @@ #include "sparse_crc32.h" #include "sparse_format.h" -#ifndef USE_MINGW +#ifndef _WIN32 #include #define O_BINARY 0 #else @@ -705,7 +705,7 @@ int write_fd_chunk(struct output_file *out, unsigned int len, aligned_diff = offset - aligned_offset; buffer_size = len + aligned_diff; -#ifndef USE_MINGW +#ifndef _WIN32 char *data = mmap64(NULL, buffer_size, PROT_READ, MAP_SHARED, fd, aligned_offset); if (data == MAP_FAILED) { @@ -733,7 +733,7 @@ int write_fd_chunk(struct output_file *out, unsigned int len, ret = out->sparse_ops->write_data_chunk(out, len, ptr); -#ifndef USE_MINGW +#ifndef _WIN32 munmap(data, buffer_size); #else free(data); diff --git a/libsparse/sparse_read.c b/libsparse/sparse_read.c index dbb4daba6..a18820277 100644 --- a/libsparse/sparse_read.c +++ b/libsparse/sparse_read.c @@ -79,7 +79,7 @@ static void verbose_error(bool verbose, int err, const char *fmt, ...) s = " at "; } if (verbose) { -#ifndef USE_MINGW +#ifndef _WIN32 if (err == -EOVERFLOW) { sparse_print_verbose("EOF while reading file%s%s\n", s, at); } else diff --git a/libutils/Printer.cpp b/libutils/Printer.cpp index 1dc86323b..98cd2c66a 100644 --- a/libutils/Printer.cpp +++ b/libutils/Printer.cpp @@ -44,7 +44,7 @@ void Printer::printFormatLine(const char* format, ...) { char* formattedString; -#ifndef USE_MINGW +#ifndef _WIN32 if (vasprintf(&formattedString, format, arglist) < 0) { // returns -1 on error ALOGE("%s: Failed to format string", __FUNCTION__); return; @@ -115,7 +115,7 @@ void FdPrinter::printLine(const char* string) { return; } -#ifndef USE_MINGW +#ifndef _WIN32 dprintf(mFd, mFormatString, mPrefix, string); #endif }