diff options
| author | Tor Andersson <tor.andersson@artifex.com> | 2016-02-15 16:29:50 +0100 |
|---|---|---|
| committer | Tor Andersson <tor.andersson@artifex.com> | 2016-02-15 16:33:10 +0100 |
| commit | 344200647a66310038be19125483b1d62483845d (patch) | |
| tree | 16f51067e4245b8f10ea6a20f2f6a9b9f2a94ce4 | |
| parent | 5dcb64bc4074e583a3fd2155c17a270feccac39f (diff) | |
| download | mupdf-344200647a66310038be19125483b1d62483845d.tar.xz | |
Drop UNUSED macro -- it dirties the namespace and is not needed.
We compile with -Wno-unused-parameters instead.
| -rw-r--r-- | include/mupdf/fitz/system.h | 5 | ||||
| -rw-r--r-- | source/fitz/error.c | 2 | ||||
| -rw-r--r-- | source/fitz/filter-dct.c | 1 | ||||
| -rw-r--r-- | source/fitz/load-jpeg.c | 1 | ||||
| -rw-r--r-- | source/pdf/pdf-nametree.c | 2 |
5 files changed, 1 insertions, 10 deletions
diff --git a/include/mupdf/fitz/system.h b/include/mupdf/fitz/system.h index abc3b9b7..6865c031 100644 --- a/include/mupdf/fitz/system.h +++ b/include/mupdf/fitz/system.h @@ -249,11 +249,6 @@ typedef int fz_off_t; #endif #endif -/* - Shut the compiler up about unused variables -*/ -#define UNUSED(x) do { x = x; } while (0) - /* ARM assembly specific defines */ #ifdef ARCH_ARM diff --git a/source/fitz/error.c b/source/fitz/error.c index 724fd078..a99a3f83 100644 --- a/source/fitz/error.c +++ b/source/fitz/error.c @@ -8,7 +8,7 @@ void fz_var_imp(void *var) { - UNUSED(var); /* Do nothing */ + /* Do nothing */ } void fz_flush_warnings(fz_context *ctx) diff --git a/source/fitz/filter-dct.c b/source/fitz/filter-dct.c index e48f90fd..c18ae79d 100644 --- a/source/fitz/filter-dct.c +++ b/source/fitz/filter-dct.c @@ -52,7 +52,6 @@ static void fz_dct_mem_free(j_common_ptr cinfo, void *object, size_t size) { fz_dctd *state = JZ_DCT_STATE_FROM_CINFO(cinfo); - UNUSED(size); fz_free(state->ctx, object); } diff --git a/source/fitz/load-jpeg.c b/source/fitz/load-jpeg.c index 2603ce7d..2640a8a4 100644 --- a/source/fitz/load-jpeg.c +++ b/source/fitz/load-jpeg.c @@ -27,7 +27,6 @@ static void fz_jpg_mem_free(j_common_ptr cinfo, void *object, size_t size) { fz_context *ctx = JZ_CTX_FROM_CINFO(cinfo); - UNUSED(size); fz_free(ctx, object); } diff --git a/source/pdf/pdf-nametree.c b/source/pdf/pdf-nametree.c index 8426b906..a3b7acb0 100644 --- a/source/pdf/pdf-nametree.c +++ b/source/pdf/pdf-nametree.c @@ -112,8 +112,6 @@ pdf_load_name_tree_imp(fz_context *ctx, pdf_obj *dict, pdf_document *doc, pdf_ob pdf_obj *names = pdf_dict_get(ctx, node, PDF_NAME_Names); int i; - UNUSED(ctx); - if (kids && !pdf_mark_obj(ctx, node)) { int len = pdf_array_len(ctx, kids); |