diff options
| author | Tor Andersson <tor.andersson@artifex.com> | 2018-03-19 10:34:30 +0100 |
|---|---|---|
| committer | Tor Andersson <tor.andersson@artifex.com> | 2018-03-22 14:58:01 +0100 |
| commit | 81c77a6b6464f5af66f851837f85ed6f9724f19e (patch) | |
| tree | 1274fafb16396e27f06d9da24dc77bfb9714b0c9 /source/pdf/pdf-annot.c | |
| parent | 5521ff9f0c4a05c969c891a547a45094377cf780 (diff) | |
| download | mupdf-81c77a6b6464f5af66f851837f85ed6f9724f19e.tar.xz | |
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.
Diffstat (limited to 'source/pdf/pdf-annot.c')
| -rw-r--r-- | source/pdf/pdf-annot.c | 4 |
1 files changed, 2 insertions, 2 deletions
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 */ |