From 324f853c7ef10cf23765b740f3a2f5a6164ad426 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Wed, 19 May 2010 08:31:25 +0000 Subject: Avoid compiler warnings on 64Bit systems git-svn-id: svn://tug.org/texlive/trunk@18349 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/libs/t1lib/ChangeLog | 4 ++++ Build/source/libs/t1lib/Makefile.am | 2 +- Build/source/libs/t1lib/Makefile.in | 29 +++++++--------------------- Build/source/texk/web2c/ChangeLog | 7 +++++++ Build/source/texk/web2c/alephdir/ChangeLog | 5 +++++ Build/source/texk/web2c/alephdir/aleph.c | 3 ++- Build/source/texk/web2c/cpascal.h | 8 ++++---- Build/source/texk/web2c/texmfmp.h | 4 ++-- Build/source/texk/xdvik/ChangeLog.TL | 5 +++++ Build/source/texk/xdvik/tests/run_tests.c | 14 +++++++------- Build/source/texk/xdvik/tests/test_dl_list.c | 2 +- 11 files changed, 45 insertions(+), 38 deletions(-) (limited to 'Build') diff --git a/Build/source/libs/t1lib/ChangeLog b/Build/source/libs/t1lib/ChangeLog index ef262ddf80e..fcedc725b41 100644 --- a/Build/source/libs/t1lib/ChangeLog +++ b/Build/source/libs/t1lib/ChangeLog @@ -1,3 +1,7 @@ +2010-05-19 Peter Breitenlohner + + * Makefile.am: Do not compile lib/type1/bstring.c. + 2010-02-27 Peter Breitenlohner * Makefile.am: List all t1lib source files. diff --git a/Build/source/libs/t1lib/Makefile.am b/Build/source/libs/t1lib/Makefile.am index a452a5c363f..e1c720bcdb0 100644 --- a/Build/source/libs/t1lib/Makefile.am +++ b/Build/source/libs/t1lib/Makefile.am @@ -93,7 +93,6 @@ lib_type1_sources = \ $(T1LIB_TREE)/lib/type1/arith.c \ $(T1LIB_TREE)/lib/type1/arith.h \ $(T1LIB_TREE)/lib/type1/blues.h \ - $(T1LIB_TREE)/lib/type1/bstring.c \ $(T1LIB_TREE)/lib/type1/cluts.h \ $(T1LIB_TREE)/lib/type1/curves.c \ $(T1LIB_TREE)/lib/type1/curves.h \ @@ -142,6 +141,7 @@ lib_type1_sources = \ $(T1LIB_TREE)/lib/type1/util.h lib_type1_unused = \ + $(T1LIB_TREE)/lib/type1/bstring.c \ $(T1LIB_TREE)/lib/type1/t1intf.h if build diff --git a/Build/source/libs/t1lib/Makefile.in b/Build/source/libs/t1lib/Makefile.in index b68f045520e..1413c9a1e1b 100644 --- a/Build/source/libs/t1lib/Makefile.in +++ b/Build/source/libs/t1lib/Makefile.in @@ -65,12 +65,12 @@ am__objects_1 = parseAFM.$(OBJEXT) t1aaset.$(OBJEXT) \ t1enc.$(OBJEXT) t1env.$(OBJEXT) t1finfo.$(OBJEXT) \ t1load.$(OBJEXT) t1outline.$(OBJEXT) t1set.$(OBJEXT) \ t1subset.$(OBJEXT) t1trans.$(OBJEXT) -am__objects_2 = arith.$(OBJEXT) bstring.$(OBJEXT) curves.$(OBJEXT) \ - fontfcn.$(OBJEXT) hints.$(OBJEXT) lines.$(OBJEXT) \ - objects.$(OBJEXT) paths.$(OBJEXT) regions.$(OBJEXT) \ - scanfont.$(OBJEXT) spaces.$(OBJEXT) t1io.$(OBJEXT) \ - t1snap.$(OBJEXT) t1stub.$(OBJEXT) token.$(OBJEXT) \ - type1.$(OBJEXT) util.$(OBJEXT) +am__objects_2 = arith.$(OBJEXT) curves.$(OBJEXT) fontfcn.$(OBJEXT) \ + hints.$(OBJEXT) lines.$(OBJEXT) objects.$(OBJEXT) \ + paths.$(OBJEXT) regions.$(OBJEXT) scanfont.$(OBJEXT) \ + spaces.$(OBJEXT) t1io.$(OBJEXT) t1snap.$(OBJEXT) \ + t1stub.$(OBJEXT) token.$(OBJEXT) type1.$(OBJEXT) \ + util.$(OBJEXT) nodist_libt1_a_OBJECTS = $(am__objects_1) $(am__objects_2) libt1_a_OBJECTS = $(nodist_libt1_a_OBJECTS) nodist_type1afm_OBJECTS = type1afm.$(OBJEXT) @@ -258,7 +258,6 @@ lib_type1_sources = \ $(T1LIB_TREE)/lib/type1/arith.c \ $(T1LIB_TREE)/lib/type1/arith.h \ $(T1LIB_TREE)/lib/type1/blues.h \ - $(T1LIB_TREE)/lib/type1/bstring.c \ $(T1LIB_TREE)/lib/type1/cluts.h \ $(T1LIB_TREE)/lib/type1/curves.c \ $(T1LIB_TREE)/lib/type1/curves.h \ @@ -307,6 +306,7 @@ lib_type1_sources = \ $(T1LIB_TREE)/lib/type1/util.h lib_type1_unused = \ + $(T1LIB_TREE)/lib/type1/bstring.c \ $(T1LIB_TREE)/lib/type1/t1intf.h @build_TRUE@dist_check_SCRIPTS = type1afm.test @@ -391,7 +391,6 @@ distclean-compile: -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/arith.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bstring.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/curves.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fontfcn.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hints.Po@am__quote@ @@ -632,20 +631,6 @@ arith.obj: $(T1LIB_TREE)/lib/type1/arith.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o arith.obj `if test -f '$(T1LIB_TREE)/lib/type1/arith.c'; then $(CYGPATH_W) '$(T1LIB_TREE)/lib/type1/arith.c'; else $(CYGPATH_W) '$(srcdir)/$(T1LIB_TREE)/lib/type1/arith.c'; fi` -bstring.o: $(T1LIB_TREE)/lib/type1/bstring.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT bstring.o -MD -MP -MF $(DEPDIR)/bstring.Tpo -c -o bstring.o `test -f '$(T1LIB_TREE)/lib/type1/bstring.c' || echo '$(srcdir)/'`$(T1LIB_TREE)/lib/type1/bstring.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/bstring.Tpo $(DEPDIR)/bstring.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(T1LIB_TREE)/lib/type1/bstring.c' object='bstring.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o bstring.o `test -f '$(T1LIB_TREE)/lib/type1/bstring.c' || echo '$(srcdir)/'`$(T1LIB_TREE)/lib/type1/bstring.c - -bstring.obj: $(T1LIB_TREE)/lib/type1/bstring.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT bstring.obj -MD -MP -MF $(DEPDIR)/bstring.Tpo -c -o bstring.obj `if test -f '$(T1LIB_TREE)/lib/type1/bstring.c'; then $(CYGPATH_W) '$(T1LIB_TREE)/lib/type1/bstring.c'; else $(CYGPATH_W) '$(srcdir)/$(T1LIB_TREE)/lib/type1/bstring.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/bstring.Tpo $(DEPDIR)/bstring.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(T1LIB_TREE)/lib/type1/bstring.c' object='bstring.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o bstring.obj `if test -f '$(T1LIB_TREE)/lib/type1/bstring.c'; then $(CYGPATH_W) '$(T1LIB_TREE)/lib/type1/bstring.c'; else $(CYGPATH_W) '$(srcdir)/$(T1LIB_TREE)/lib/type1/bstring.c'; fi` - curves.o: $(T1LIB_TREE)/lib/type1/curves.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT curves.o -MD -MP -MF $(DEPDIR)/curves.Tpo -c -o curves.o `test -f '$(T1LIB_TREE)/lib/type1/curves.c' || echo '$(srcdir)/'`$(T1LIB_TREE)/lib/type1/curves.c @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/curves.Tpo $(DEPDIR)/curves.Po diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog index 3cf0383b332..fccd99114c0 100644 --- a/Build/source/texk/web2c/ChangeLog +++ b/Build/source/texk/web2c/ChangeLog @@ -1,3 +1,10 @@ +2010-05-19 Peter Breitenlohner + + * cpascal.h (BIBXRETALLOCNOSET, BIBXRETALLOCSTRING): Cast size_t + to long for printing to avoid warnings on 64Bit systems. + * texmfmp.h (undumpcheckedthings, undumpuppercheckthings): + Cast high limit to unsigned long for printing. + 2010-05-18 Karl Berry * configure.ac (web2_version): use /pretest ident. diff --git a/Build/source/texk/web2c/alephdir/ChangeLog b/Build/source/texk/web2c/alephdir/ChangeLog index 520a31befb1..3f7ce719757 100644 --- a/Build/source/texk/web2c/alephdir/ChangeLog +++ b/Build/source/texk/web2c/alephdir/ChangeLog @@ -1,3 +1,8 @@ +2010-05-19 Peter Breitenlohner + + * aleph.c (new_input_line): Cast integer to long for printing + to avoid warning on 64Bit systems. + 2010-05-18 Peter Breitenlohner * eobase.ch: Adapt to ../etexdir/etex.ch: diff --git a/Build/source/texk/web2c/alephdir/aleph.c b/Build/source/texk/web2c/alephdir/aleph.c index 6a19be3884c..315f9ad4cd4 100644 --- a/Build/source/texk/web2c/alephdir/aleph.c +++ b/Build/source/texk/web2c/alephdir/aleph.c @@ -179,7 +179,8 @@ new_input_line (FILE *f, halfword themode) if (i != EOF && (((themode!=2) && (i != '\n')) || ((themode==2) && (i != 0x25)))) { (void) fprintf (stderr, - "! Unable to read an entire line---ocp_buf_size=%ld.\n",ocpbufsize); + "! Unable to read an entire line---ocp_buf_size=%ld.\n", + (long) ocpbufsize); (void) fprintf (stderr, "Please increase ocp_buf_size in texmf.cnf.\n"); uexit (1); } diff --git a/Build/source/texk/web2c/cpascal.h b/Build/source/texk/web2c/cpascal.h index c98a1b2c529..a4b5976d295 100644 --- a/Build/source/texk/web2c/cpascal.h +++ b/Build/source/texk/web2c/cpascal.h @@ -167,8 +167,8 @@ typedef unsigned char *pointertobyte; Actually allocate one more than requests, so we can index the last entry, as Pascal wants to do. */ #define BIBXRETALLOCNOSET(array_name, array_var, type, size_var, new_size) \ - fprintf (logfile, "Reallocated %s (elt_size=%d) to %ld items from %ld.\n", \ - array_name, (int) sizeof (type), new_size, size_var); \ + fprintf (logfile, "Reallocated %s (elt_size=%ld) to %ld items from %ld.\n", \ + array_name, (long) sizeof (type), (long) new_size, (long) size_var); \ XRETALLOC (array_var, new_size + 1, type) /* Same as above, but also increase SIZE_VAR when no more arrays with the same size parameter will be resized. */ @@ -178,8 +178,8 @@ typedef unsigned char *pointertobyte; } while (0) /* Same as above, but for the pseudo-TYPE ASCII_code[LENGTH+1]. */ #define BIBXRETALLOCSTRING(array_name, array_var, length, size_var, new_size) \ - fprintf (logfile, "Reallocated %s (elt_size=%d) to %ld items from %ld.\n", \ - array_name, (int) (length + 1), new_size, size_var); \ + fprintf (logfile, "Reallocated %s (elt_size=%ld) to %ld items from %ld.\n", \ + array_name, (long) (length + 1), (long) new_size, (long) size_var); \ XRETALLOC (array_var, (new_size) * (length + 1), ASCIIcode) /* Need precisely int for getopt, etc. */ diff --git a/Build/source/texk/web2c/texmfmp.h b/Build/source/texk/web2c/texmfmp.h index 0dfdb8f42ad..77e7a756f64 100644 --- a/Build/source/texk/web2c/texmfmp.h +++ b/Build/source/texk/web2c/texmfmp.h @@ -285,7 +285,7 @@ extern void paintrow (/*screenrow, pixelcolor, transspec, screencol*/); if ((&(base))[i] < (low) || (&(base))[i] > (high)) { \ FATAL5 ("Item %u (=%ld) of .fmt array at %lx <%ld or >%ld", \ i, (unsigned long) (&(base))[i], (unsigned long) &(base),\ - (unsigned long) low, (integer) high); \ + (unsigned long) low, (unsigned long) high); \ } \ } \ } while (0) @@ -301,7 +301,7 @@ extern void paintrow (/*screenrow, pixelcolor, transspec, screencol*/); if ((&(base))[i] > (high)) { \ FATAL4 ("Item %u (=%ld) of .fmt array at %lx >%ld", \ i, (unsigned long) (&(base))[i], (unsigned long) &(base),\ - (integer) high); \ + (unsigned long) high); \ } \ } \ } while (0) diff --git a/Build/source/texk/xdvik/ChangeLog.TL b/Build/source/texk/xdvik/ChangeLog.TL index 63f1b4ef20f..811c89545f5 100644 --- a/Build/source/texk/xdvik/ChangeLog.TL +++ b/Build/source/texk/xdvik/ChangeLog.TL @@ -1,6 +1,11 @@ ChangeLog.TL: Changes for xdvik (TeX Live) ================================================== +2010-05-19 Peter Breitenlohner + + * tests/run_tests.c, test_dl_list.c: Cast size_t to long for + printing to avoid warnings on 64Bit systems. + 2010-03-29 Peter Breitenlohner * configure.ac: Remove AC_TYPE_SIZE_T, now part of KPSE_COMMON. diff --git a/Build/source/texk/xdvik/tests/run_tests.c b/Build/source/texk/xdvik/tests/run_tests.c index 5235b9b5b2c..f4d672aa0bc 100644 --- a/Build/source/texk/xdvik/tests/run_tests.c +++ b/Build/source/texk/xdvik/tests/run_tests.c @@ -31,7 +31,7 @@ test_str_list_equality(int verbosity, char **str_list1, char **str_list2) if (str_list1[i] == NULL || str_list2[i] == NULL) { if (verbosity) { - ERROR((stderr, "Items %d differ: |%s| != |%s|\n", i, str_list1[i], str_list2[i])); + ERROR((stderr, "Items %ld differ: |%s| != |%s|\n", (long) i, str_list1[i], str_list2[i])); } return False; } @@ -39,12 +39,12 @@ test_str_list_equality(int verbosity, char **str_list1, char **str_list2) res = strcmp(str_list1[i], str_list2[i]); if (res != 0) { if (verbosity) { - ERROR((stderr, "Items %d differ: |%s| != |%s|\n", i, str_list1[i], str_list2[i])); + ERROR((stderr, "Items %ld differ: |%s| != |%s|\n", (long) i, str_list1[i], str_list2[i])); } return False; } else if (verbosity) { - INFO((stderr, "Items %d equal: |%s| == |%s|\n", i, str_list1[i], str_list2[i])); + INFO((stderr, "Items %ld equal: |%s| == |%s|\n", (long) i, str_list1[i], str_list2[i])); } } return True; @@ -78,7 +78,7 @@ run_all_tests(int verbosity) int tests_failed = 0; int tests_ok = 0; - fprintf(stdout, "\nGoing to run %d tests ...\n", m_test_proc_size); + fprintf(stdout, "\nGoing to run %ld tests ...\n", (long) m_test_proc_size); for (i = 0; i < m_test_proc_size; i++) { Boolean retval = m_test_proc_list[i].proc(verbosity); @@ -89,9 +89,9 @@ run_all_tests(int verbosity) else { tests_ok++; } - fprintf(stdout, "%sTest %d: %s (%s)\n", + fprintf(stdout, "%sTest %ld: %s (%s)\n", retval ? "" : "*****", - i + 1, + (long) i + 1, retval ? "OK" : "FAILURE", m_test_proc_list[i].name); } @@ -102,7 +102,7 @@ run_all_tests(int verbosity) return True; } else { - fprintf(stdout, "Darn, %d of %d tests failed!\n\n", tests_failed, m_test_proc_size); + fprintf(stdout, "Darn, %d of %ld tests failed!\n\n", tests_failed, (long) m_test_proc_size); return False; } } diff --git a/Build/source/texk/xdvik/tests/test_dl_list.c b/Build/source/texk/xdvik/tests/test_dl_list.c index a929b76ef6c..2ebc7409493 100644 --- a/Build/source/texk/xdvik/tests/test_dl_list.c +++ b/Build/source/texk/xdvik/tests/test_dl_list.c @@ -34,7 +34,7 @@ static Boolean test_equality(int verbose, if (list_len != elem_cnt) { if (verbose) { - ERROR((stderr, "List len %d != %d\n", list_len, elem_cnt)); + ERROR((stderr, "List len %ld != %ld\n", (long) list_len, (long) elem_cnt)); } return False; } -- cgit v1.2.3