From 81c77a6b6464f5af66f851837f85ed6f9724f19e Mon Sep 17 00:00:00 2001 From: Tor Andersson Date: Mon, 19 Mar 2018 10:34:30 +0100 Subject: Clean up windows ifdefs. _WIN32 is always defined on windows (it means the WinAPI is available). _WIN64 is also defined on 64-bit targets. This means the test for defined(_WIN32) || defined(_WIN64) is redundant, since if _WIN64 is defined, then _WIN32 is always also defined. MSC_VER is only defined for MSVC, so split the ifdef sections in include/fitz/system.h into separate MSVC and WIN32 parts so that we can build with MinGW and other non-MSVC compilers on windows. --- source/fitz/stream-prog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/fitz/stream-prog.c') diff --git a/source/fitz/stream-prog.c b/source/fitz/stream-prog.c index 89158832..f8fa456c 100644 --- a/source/fitz/stream-prog.c +++ b/source/fitz/stream-prog.c @@ -137,7 +137,7 @@ fz_stream * fz_open_file_progressive(fz_context *ctx, const char *name, int bps) { FILE *f; -#if defined(_WIN32) || defined(_WIN64) +#ifdef _WIN32 f = fz_fopen_utf8(name, "rb"); #else f = fopen(name, "rb"); -- cgit v1.2.3