From 551a880de3f3e65366ae42a679d48cfb1e2d74eb Mon Sep 17 00:00:00 2001
From: Tor Andersson <tor.andersson@artifex.com>
Date: Mon, 24 Apr 2017 11:28:14 +0200
Subject: Use namespace prefix for bidi defines.

---
 include/mupdf/fitz/bidi.h | 8 ++++----
 source/fitz/bidi.c        | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/include/mupdf/fitz/bidi.h b/include/mupdf/fitz/bidi.h
index 230f6a94..595f25ba 100644
--- a/include/mupdf/fitz/bidi.h
+++ b/include/mupdf/fitz/bidi.h
@@ -32,8 +32,8 @@ fz_bidi_direction;
 
 typedef enum fz_bidi_flags_e
 {
-	BIDI_CLASSIFY_WHITE_SPACE = 1,
-	BIDI_REPLACE_TAB = 2
+	FZ_BIDI_CLASSIFY_WHITE_SPACE = 1,
+	FZ_BIDI_REPLACE_TAB = 2
 }
 fz_bidi_flags;
 
@@ -50,7 +50,7 @@ fz_bidi_flags;
 				than common or inherited)
 	@param	arg		data from caller of Bidi_fragmentText
 */
-typedef void (fz_bidi_fragment_callback)(const uint32_t *fragment,
+typedef void (fz_bidi_fragment_fn)(const uint32_t *fragment,
 					size_t fragmentLen,
 					int bidiLevel,
 					int script,
@@ -80,7 +80,7 @@ void fz_bidi_fragment_text(fz_context *ctx,
 			const uint32_t *text,
 			size_t textlen,
 			fz_bidi_direction *baseDir,
-			fz_bidi_fragment_callback *callback,
+			fz_bidi_fragment_fn *callback,
 			void *arg,
 			int flags);
 
diff --git a/source/fitz/bidi.c b/source/fitz/bidi.c
index b31ca749..84b75b49 100644
--- a/source/fitz/bidi.c
+++ b/source/fitz/bidi.c
@@ -176,7 +176,7 @@ split_at_script(const uint32_t *fragment,
 		size_t fragment_len,
 		int level,
 		void *arg,
-		fz_bidi_fragment_callback *callback)
+		fz_bidi_fragment_fn *callback)
 {
 	int script = UCDN_SCRIPT_COMMON;
 	size_t script_start, i;
@@ -224,7 +224,7 @@ classify_characters(const uint32_t *text,
 {
 	size_t i;
 
-	if ((flags & BIDI_CLASSIFY_WHITE_SPACE)!=0)
+	if ((flags & FZ_BIDI_CLASSIFY_WHITE_SPACE)!=0)
 	{
 		for (i = 0; i < len; i++)
 		{
@@ -481,7 +481,7 @@ create_levels(fz_context *ctx,
 			fz_bidi_resolve_neutrals(baseLevel, ptypes, plevels, plen);
 			fz_bidi_resolve_implicit(ptypes, plevels, plen);
 
-			classify_characters(ptext, ptypes, plen, BIDI_CLASSIFY_WHITE_SPACE);
+			classify_characters(ptext, ptypes, plen, FZ_BIDI_CLASSIFY_WHITE_SPACE);
 
 			if (resolveWhiteSpace)
 			{
@@ -529,7 +529,7 @@ void fz_bidi_fragment_text(fz_context *ctx,
 		const uint32_t *text,
 		size_t textlen,
 		fz_bidi_direction *baseDir,
-		fz_bidi_fragment_callback *callback,
+		fz_bidi_fragment_fn *callback,
 		void *arg,
 		int flags)
 {
-- 
cgit v1.2.3