diff options
| author | Tor Andersson <tor.andersson@artifex.com> | 2018-06-22 17:02:32 +0200 |
|---|---|---|
| committer | Robin Watts <robin.watts@artifex.com> | 2018-06-22 18:07:58 +0100 |
| commit | 776c75656186a7f087832d4befc5d83154a132cb (patch) | |
| tree | e295e302e8e05791af673c1a9cc054889f79ae98 /source/fitz/halftone.c | |
| parent | 289a8b3bae2e076e58349943519611d4dad6c3cc (diff) | |
| download | mupdf-776c75656186a7f087832d4befc5d83154a132cb.tar.xz | |
Don't pollute namespace with our 'restrict' macro. Use FZ_RESTRICT instead.
Diffstat (limited to 'source/fitz/halftone.c')
| -rw-r--r-- | source/fitz/halftone.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/fitz/halftone.c b/source/fitz/halftone.c index 7eef275f..c99653f6 100644 --- a/source/fitz/halftone.c +++ b/source/fitz/halftone.c @@ -156,11 +156,11 @@ typedef void (threshold_fn)(const unsigned char *ht_line, const unsigned char *p #ifdef ARCH_ARM static void -do_threshold_1(const unsigned char * restrict ht_line, const unsigned char * restrict pixmap, unsigned char *restrict out, int w, int ht_len) +do_threshold_1(const unsigned char * FZ_RESTRICT ht_line, const unsigned char * FZ_RESTRICT pixmap, unsigned char *FZ_RESTRICT out, int w, int ht_len) __attribute__((naked)); static void -do_threshold_1(const unsigned char * restrict ht_line, const unsigned char * restrict pixmap, unsigned char *restrict out, int w, int ht_len) +do_threshold_1(const unsigned char * FZ_RESTRICT ht_line, const unsigned char * FZ_RESTRICT pixmap, unsigned char *FZ_RESTRICT out, int w, int ht_len) { asm volatile( ENTER_ARM @@ -281,7 +281,7 @@ do_threshold_1(const unsigned char * restrict ht_line, const unsigned char * res ); } #else -static void do_threshold_1(const unsigned char * restrict ht_line, const unsigned char * restrict pixmap, unsigned char * restrict out, int w, int ht_len) +static void do_threshold_1(const unsigned char * FZ_RESTRICT ht_line, const unsigned char * FZ_RESTRICT pixmap, unsigned char * FZ_RESTRICT out, int w, int ht_len) { int h; int l = ht_len; @@ -348,11 +348,11 @@ static void do_threshold_1(const unsigned char * restrict ht_line, const unsigne */ #ifdef ARCH_ARM static void -do_threshold_4(const unsigned char * restrict ht_line, const unsigned char * restrict pixmap, unsigned char *restrict out, int w, int ht_len) +do_threshold_4(const unsigned char * FZ_RESTRICT ht_line, const unsigned char * FZ_RESTRICT pixmap, unsigned char *FZ_RESTRICT out, int w, int ht_len) __attribute__((naked)); static void -do_threshold_4(const unsigned char * restrict ht_line, const unsigned char * restrict pixmap, unsigned char *restrict out, int w, int ht_len) +do_threshold_4(const unsigned char * FZ_RESTRICT ht_line, const unsigned char * FZ_RESTRICT pixmap, unsigned char *FZ_RESTRICT out, int w, int ht_len) { asm volatile( ENTER_ARM @@ -447,7 +447,7 @@ do_threshold_4(const unsigned char * restrict ht_line, const unsigned char * res ); } #else -static void do_threshold_4(const unsigned char * restrict ht_line, const unsigned char * restrict pixmap, unsigned char * restrict out, int w, int ht_len) +static void do_threshold_4(const unsigned char * FZ_RESTRICT ht_line, const unsigned char * FZ_RESTRICT pixmap, unsigned char * FZ_RESTRICT out, int w, int ht_len) { int l = ht_len; |