summaryrefslogtreecommitdiff
path: root/source/cbz
diff options
context:
space:
mode:
authorSimon Bünzli <zeniko@gmail.com>2014-01-02 21:27:15 +0100
committerRobin Watts <robin.watts@artifex.com>2014-01-06 13:13:35 +0000
commit9b92bac1ec135862132b1c49b977b53891b73d88 (patch)
treedfd5faac92aa678cc5c8b23ae626d347b9d17494 /source/cbz
parentf6fe26922653b45519d406bd07840719cef1d979 (diff)
downloadmupdf-9b92bac1ec135862132b1c49b977b53891b73d88.tar.xz
fix various MSVC warnings
Some warnings we'd like to enable for MuPDF and still be able to compile it with warnings as errors using MSVC (2008 to 2013): * C4115: 'timeval' : named type definition in parentheses * C4204: nonstandard extension used : non-constant aggregate initializer * C4295: 'hex' : array is too small to include a terminating null character * C4389: '==' : signed/unsigned mismatch * C4702: unreachable code * C4706: assignment within conditional expression Also, globally disable C4701 which is frequently caused by MSVC not being able to correctly figure out fz_try/fz_catch code flow. And don't define isnan for VS2013 and later where that's no longer needed.
Diffstat (limited to 'source/cbz')
-rw-r--r--source/cbz/mucbz.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/source/cbz/mucbz.c b/source/cbz/mucbz.c
index 4ebb623a..d9be58f3 100644
--- a/source/cbz/mucbz.c
+++ b/source/cbz/mucbz.c
@@ -160,7 +160,6 @@ cbz_read_zip_entry(cbz_document *doc, int offset, int *sizep)
}
fz_throw(ctx, FZ_ERROR_GENERIC, "unknown zip method: %d", method);
- return NULL; /* not reached */
}
static void