From 64cbc4e1dc17492d89915a9d774dc15ee438ccfe Mon Sep 17 00:00:00 2001 From: Przemyslaw Skibinski Date: Wed, 21 Dec 2016 10:22:40 +0100 Subject: improved MinGW support --- programs/lz4cli.c | 3 +++ programs/lz4io.c | 6 ------ programs/platform.h | 3 +++ tests/frametest.c | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/programs/lz4cli.c b/programs/lz4cli.c index 366aed5..e03aa98 100644 --- a/programs/lz4cli.c +++ b/programs/lz4cli.c @@ -507,6 +507,9 @@ int main(int argc, const char** argv) #ifdef PLATFORM_POSIX_VERSION DISPLAYLEVEL(4, "PLATFORM_POSIX_VERSION defined: %ldL\n", (long) PLATFORM_POSIX_VERSION); #endif +#ifdef _FILE_OFFSET_BITS + DISPLAYLEVEL(4, "_FILE_OFFSET_BITS defined: %ldL\n", (long) _FILE_OFFSET_BITS); +#endif if ((mode == om_compress) || (mode == om_bench)) DISPLAYLEVEL(4, "Blocks size : %i KB\n", (U32)(blockSize>>10)); if (multiple_inputs) { diff --git a/programs/lz4io.c b/programs/lz4io.c index 15c69f0..df3ed41 100644 --- a/programs/lz4io.c +++ b/programs/lz4io.c @@ -30,12 +30,6 @@ - The license of this source file is GPLv2. */ -/************************************** -* Compiler Options -**************************************/ -#if defined(__MINGW32__) && !defined(_POSIX_SOURCE) -# define _POSIX_SOURCE 1 /* disable %llu warnings with MinGW on Windows */ -#endif /***************************** * Includes diff --git a/programs/platform.h b/programs/platform.h index c4b97c8..02ebd4c 100644 --- a/programs/platform.h +++ b/programs/platform.h @@ -42,6 +42,9 @@ extern "C" { # define fseek _fseeki64 # endif #endif +#if defined(__MINGW32__) && !defined(_POSIX_SOURCE) +# define _POSIX_C_SOURCE 1 /* enable __VA_ARGS__ and disable %llu warnings with MinGW on Windows */ +#endif /* ************************************** diff --git a/tests/frametest.c b/tests/frametest.c index ba971d6..8b7caba 100644 --- a/tests/frametest.c +++ b/tests/frametest.c @@ -92,7 +92,7 @@ static clock_t g_clockTime = 0; *****************************************/ static U32 no_prompt = 0; static U32 displayLevel = 2; -static U32 pause = 0; +static U32 use_pause = 0; /*-******************************************************* @@ -705,7 +705,7 @@ _end: free(compressedBuffer); free(decodedBuffer); - if (pause) { + if (use_pause) { DISPLAY("press enter to finish \n"); (void)getchar(); } @@ -777,7 +777,7 @@ int main(int argc, const char** argv) break; case 'p': /* pause at the end */ argument++; - pause = 1; + use_pause = 1; break; case 'i': -- cgit v0.12