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/pdf/pdf-annot.c | 4 ++-- source/pdf/pdf-js.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'source/pdf') diff --git a/source/pdf/pdf-annot.c b/source/pdf/pdf-annot.c index 56b42e48..314ca092 100644 --- a/source/pdf/pdf-annot.c +++ b/source/pdf/pdf-annot.c @@ -119,7 +119,7 @@ pdf_parse_file_spec(fz_context *ctx, pdf_document *doc, pdf_obj *file_spec, pdf_ filename = file_spec; if (pdf_is_dict(ctx, file_spec)) { -#if defined(_WIN32) || defined(_WIN64) +#ifdef _WIN32 filename = pdf_dict_get(ctx, file_spec, PDF_NAME_DOS); #else filename = pdf_dict_get(ctx, file_spec, PDF_NAME_Unix); @@ -135,7 +135,7 @@ pdf_parse_file_spec(fz_context *ctx, pdf_document *doc, pdf_obj *file_spec, pdf_ } path = pdf_to_utf8(ctx, filename); -#if defined(_WIN32) || defined(_WIN64) +#ifdef _WIN32 if (strcmp(pdf_to_name(ctx, pdf_dict_gets(ctx, file_spec, "FS")), "URL") != 0) { /* move the file name into the expected place and use the expected path separator */ diff --git a/source/pdf/pdf-js.c b/source/pdf/pdf-js.c index 82018065..0024670a 100644 --- a/source/pdf/pdf-js.c +++ b/source/pdf/pdf-js.c @@ -510,7 +510,7 @@ static void declare_dom(pdf_js *js) /* Create the 'app' object */ js_newobject(J); { -#if defined(_WIN32) || defined(_WIN64) +#ifdef _WIN32 js_pushstring(J, "WIN"); #elif defined(__APPLE__) js_pushstring(J, "MAC"); -- cgit v1.2.3