texk/mendexk: Avoid compiler warnings

git-svn-id: svn://tug.org/texlive/trunk@33971 c570f23f-e606-0410-a88d-b1316a301751

5 files changed, 12 insertions, 6 deletions

diff --git a/Build/source/texk/mendexk/ChangeLog b/Build/source/texk/mendexk/ChangeLog
index 46d0c29a4a5..9834020d6cb 100644
--- a/Build/source/texk/mendexk/ChangeLog
+++ b/Build/source/texk/mendexk/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-11  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* convert.c: Add (unsigned char*) cast arg1 of UTF8StoUCS().
+	* fwrite.c: Declare fprint_euc_char() as static.
+
 2014-05-11  TANAKA Takuji  <KXD02663@nifty.ne.jp>
 
 	* main.c: Add TeX Live version.
diff --git a/Build/source/texk/mendexk/Makefile.am b/Build/source/texk/mendexk/Makefile.am
index f27d2fb337c..b9b4add0044 100644
--- a/Build/source/texk/mendexk/Makefile.am
+++ b/Build/source/texk/mendexk/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile.am for the TeX Live subdirectory texk/mendexk/
 ##
-## Copyright (C) 2010-2012 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2010-2014 Peter Breitenlohner <tex-live@tug.org>
 ## You may freely use, modify and/or distribute this file.
 ##
 ACLOCAL_AMFLAGS = -I ../../m4
@@ -58,5 +58,5 @@ EXTRA_DIST += $(TESTS)
 ## tests/mendex.test
 EXTRA_DIST += tests/foo.idx tests/foo.ind \
 	tests/uni.idx tests/uni.dict tests/uni.ist tests/uni.ind
- (%s)DISTCLEANFILES = foo.* uni.*
+DISTCLEANFILES = foo.* uni.*
 
diff --git a/Build/source/texk/mendexk/Makefile.in b/Build/source/texk/mendexk/Makefile.in
index 6173eded820..3b0027d4b46 100644
--- a/Build/source/texk/mendexk/Makefile.in
+++ b/Build/source/texk/mendexk/Makefile.in
@@ -559,9 +559,10 @@ mendex_SOURCES = \
 LDADD = $(PTEXENC_LIBS) $(KPATHSEA_LIBS)	
 dist_man1_MANS = mendex.1
 EXTRA_DIST = COPYRIGHT COPYRIGHT.jis ChangeLog.jis indexsty mendex.doc \
-	$(TESTS) tests/foo.idx tests/foo.ind
+	$(TESTS) tests/foo.idx tests/foo.ind tests/uni.idx \
+	tests/uni.dict tests/uni.ist tests/uni.ind
 TESTS = tests/mendex.test
-DISTCLEANFILES = foo.*
+DISTCLEANFILES = foo.* uni.*
 all: c-auto.h
 	$(MAKE) $(AM_MAKEFLAGS) all-am
 
diff --git a/Build/source/texk/mendexk/convert.c b/Build/source/texk/mendexk/convert.c
index eae28c970e9..ce89c06f7fe 100644
--- a/Build/source/texk/mendexk/convert.c
+++ b/Build/source/texk/mendexk/convert.c
@@ -217,7 +217,7 @@ int convert(char *buff1, char *buff2)
 					i++;
 					continue;
 				}
-				chr = UCS2toJIS(UTF8StoUCS(&buff1[i]));
+				chr = UCS2toJIS(UTF8StoUCS((unsigned char*)&buff1[i]));
 				if (chr==0) chr = 0xffff; /* conversion failed */
 				chr |= 0x8080;
 				buff3[0]=BYTE3(chr);
diff --git a/Build/source/texk/mendexk/fwrite.c b/Build/source/texk/mendexk/fwrite.c
index 0dd7604e5f2..80e7b77cbba 100644
--- a/Build/source/texk/mendexk/fwrite.c
+++ b/Build/source/texk/mendexk/fwrite.c
@@ -25,7 +25,7 @@ static void crcheck(char *lbuff, FILE *fp);
 #define BUFFERLEN 4096
 #define TAIL_LEN(x) ((x)+strlen(x)), (BUFFERLEN-strlen(x))
 
-void fprint_euc_char(FILE *fp, const char a, const char b)
+static void fprint_euc_char(FILE *fp, const char a, const char b)
 {
 	if (is_internalUPTEX()) {  /* convert a character from EUC to UTF8 */
 		int k = 0;