diff options
| author | Robin Watts <robin.watts@artifex.com> | 2015-02-25 18:23:49 +0000 |
|---|---|---|
| committer | Robin Watts <robin.watts@artifex.com> | 2015-02-25 18:34:37 +0000 |
| commit | 76dff1dc896a57c9daa96df3177884f59f8cee6c (patch) | |
| tree | eeb31d2359b0ebd3b58e3a67434101ee291187ae /source | |
| parent | 92770188d52bed40b9d370fae571897c2b469293 (diff) | |
| download | mupdf-76dff1dc896a57c9daa96df3177884f59f8cee6c.tar.xz | |
Add 64 bit windows builds to MSVC solution.
A few casts are required within the code, along with a few #ifdef
changes.
Some tweaks to curl are required too.
Diffstat (limited to 'source')
| -rw-r--r-- | source/fitz/memento.c | 2 | ||||
| -rw-r--r-- | source/fitz/memory.c | 2 | ||||
| -rw-r--r-- | source/fitz/stream-open.c | 4 | ||||
| -rw-r--r-- | source/fitz/stream-prog.c | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/source/fitz/memento.c b/source/fitz/memento.c index 76b9f1fe..a8708c33 100644 --- a/source/fitz/memento.c +++ b/source/fitz/memento.c @@ -61,7 +61,7 @@ android_fprintf(FILE *file, const char *fmt, ...) #define MEMENTO_STACKTRACE_METHOD 0 #endif -#ifdef _WIN32 +#if defined(_WIN32) || defined(_WIN64) #include <windows.h> static int diff --git a/source/fitz/memory.c b/source/fitz/memory.c index f9e7b4f6..e26ddd0d 100644 --- a/source/fitz/memory.c +++ b/source/fitz/memory.c @@ -269,7 +269,7 @@ int fz_lock_taken[FZ_LOCK_DEBUG_CONTEXT_MAX][FZ_LOCK_MAX] = { { 0 } }; * when threads are involved. */ static int ms_clock(void) { -#ifdef _WIN32 +#if defined(_WIN32) || defined(_WIN64) return (int)GetTickCount(); #else struct timeval tp; diff --git a/source/fitz/stream-open.c b/source/fitz/stream-open.c index fe8fc443..6994293e 100644 --- a/source/fitz/stream-open.c +++ b/source/fitz/stream-open.c @@ -125,7 +125,7 @@ fz_open_fd(fz_context *ctx, int fd) fz_stream * fz_open_file(fz_context *ctx, const char *name) { -#ifdef _WIN32 +#if defined(_WIN32) || defined(_WIN64) char *s = (char*)name; wchar_t *wname, *d; int c, fd; @@ -145,7 +145,7 @@ fz_open_file(fz_context *ctx, const char *name) return fz_open_fd(ctx, fd); } -#ifdef _WIN32 +#if defined(_WIN32) || defined(_WIN64) fz_stream * fz_open_file_w(fz_context *ctx, const wchar_t *name) { diff --git a/source/fitz/stream-prog.c b/source/fitz/stream-prog.c index fbf42666..c7054bcb 100644 --- a/source/fitz/stream-prog.c +++ b/source/fitz/stream-prog.c @@ -1,7 +1,7 @@ #include "mupdf/fitz/stream.h" #include "mupdf/fitz/string.h" -#if defined(_WIN32) && !defined(NDEBUG) +#if (defined(_WIN32) || defined(_WIN64)) && !defined(NDEBUG) #include "windows.h" static void @@ -169,7 +169,7 @@ fz_open_fd_progressive(fz_context *ctx, int fd, int bps) fz_stream * fz_open_file_progressive(fz_context *ctx, const char *name, int bps) { -#ifdef _WIN32 +#if defined(_WIN32) || defined(_WIN64) char *s = (char*)name; wchar_t *wname, *d; int c, fd; |