diff options
Diffstat (limited to 'source/fitz')
-rw-r--r-- | source/fitz/memento.c | 2 | ||||
-rw-r--r-- | source/fitz/memory.c | 2 | ||||
-rw-r--r-- | source/fitz/output.c | 6 | ||||
-rw-r--r-- | source/fitz/stream-open.c | 10 | ||||
-rw-r--r-- | source/fitz/stream-prog.c | 2 |
5 files changed, 11 insertions, 11 deletions
diff --git a/source/fitz/memento.c b/source/fitz/memento.c index a71dce7f..a87b720d 100644 --- a/source/fitz/memento.c +++ b/source/fitz/memento.c @@ -143,7 +143,7 @@ android_fprintf(FILE *file, const char *fmt, ...) #define MEMENTO_STACKTRACE_METHOD 3 #endif -#if defined(_WIN32) || defined(_WIN64) +#ifdef _WIN32 #include <windows.h> static int diff --git a/source/fitz/memory.c b/source/fitz/memory.c index 1643647d..ad5b69aa 100644 --- a/source/fitz/memory.c +++ b/source/fitz/memory.c @@ -284,7 +284,7 @@ int fz_lock_taken[FZ_LOCK_DEBUG_CONTEXT_MAX][FZ_LOCK_MAX] = { { 0 } }; * when threads are involved. */ static int ms_clock(void) { -#if defined(_WIN32) || defined(_WIN64) +#ifdef _WIN32 return (int)GetTickCount(); #else struct timeval tp; diff --git a/source/fitz/output.c b/source/fitz/output.c index 32813fd8..4ee0023c 100644 --- a/source/fitz/output.c +++ b/source/fitz/output.c @@ -137,7 +137,7 @@ static void file_seek(fz_context *ctx, void *opaque, int64_t off, int whence) { FILE *file = opaque; -#if defined(_WIN32) || defined(_WIN64) +#ifdef _WIN32 int n = _fseeki64(file, off, whence); #else int n = fseeko(file, off, whence); @@ -150,7 +150,7 @@ static int64_t file_tell(fz_context *ctx, void *opaque) { FILE *file = opaque; -#if defined(_WIN32) || defined(_WIN64) +#ifdef _WIN32 int64_t off = _ftelli64(file); #else int64_t off = ftello(file); @@ -221,7 +221,7 @@ fz_new_output_with_path(fz_context *ctx, const char *filename, int append) if (!strcmp(filename, "/dev/null") || !fz_strcasecmp(filename, "nul:")) return fz_new_output(ctx, 0, NULL, null_write, NULL, NULL); -#if defined(_WIN32) || defined(_WIN64) +#ifdef _WIN32 /* Ensure we create a brand new file. We don't want to clobber our old file. */ if (!append) { diff --git a/source/fitz/stream-open.c b/source/fitz/stream-open.c index 62e410a4..813b7099 100644 --- a/source/fitz/stream-open.c +++ b/source/fitz/stream-open.c @@ -14,7 +14,7 @@ int fz_file_exists(fz_context *ctx, const char *path) { FILE *file; -#if defined(_WIN32) || defined(_WIN64) +#ifdef _WIN32 file = fz_fopen_utf8(path, "rb"); #else file = fopen(path, "rb"); @@ -106,14 +106,14 @@ static int next_file(fz_context *ctx, fz_stream *stm, size_t n) static void seek_file(fz_context *ctx, fz_stream *stm, int64_t offset, int whence) { fz_file_stream *state = stm->state; -#if defined(_WIN32) || defined(_WIN64) +#ifdef _WIN32 int64_t n = _fseeki64(state->file, offset, whence); #else int64_t n = fseeko(state->file, offset, whence); #endif if (n < 0) fz_throw(ctx, FZ_ERROR_GENERIC, "cannot seek: %s", strerror(errno)); -#if defined(_WIN32) || defined(_WIN64) +#ifdef _WIN32 stm->pos = _ftelli64(state->file); #else stm->pos = ftello(state->file); @@ -156,7 +156,7 @@ fz_stream * fz_open_file(fz_context *ctx, const char *name) { FILE *file; -#if defined(_WIN32) || defined(_WIN64) +#ifdef _WIN32 file = fz_fopen_utf8(name, "rb"); #else file = fopen(name, "rb"); @@ -166,7 +166,7 @@ fz_open_file(fz_context *ctx, const char *name) return fz_open_file_ptr(ctx, file); } -#if defined(_WIN32) || defined(_WIN64) +#ifdef _WIN32 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 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"); |