From b9e3d7df5c02ed0faf5dd208f547619f3d96bd93 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Wed, 10 Dec 2014 12:16:09 +0000 Subject: texk/{ttfdump,web2c,xdvik}: Minor changes to avoid some compiler warnings git-svn-id: svn://tug.org/texlive/trunk@35780 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/ttfdump/ChangeLog | 4 ++++ Build/source/texk/ttfdump/libttf/pclt.c | 2 +- Build/source/texk/web2c/synctexdir/ChangeLog | 4 ++++ Build/source/texk/web2c/synctexdir/synctex.c | 2 +- Build/source/texk/xdvik/ChangeLog | 5 +++++ Build/source/texk/xdvik/hypertex.h | 2 +- Build/source/texk/xdvik/xdvi.c | 4 ++-- 7 files changed, 18 insertions(+), 5 deletions(-) (limited to 'Build/source') diff --git a/Build/source/texk/ttfdump/ChangeLog b/Build/source/texk/ttfdump/ChangeLog index 94e962aff4a..ec43c77c70d 100644 --- a/Build/source/texk/ttfdump/ChangeLog +++ b/Build/source/texk/ttfdump/ChangeLog @@ -1,3 +1,7 @@ +2014-12-10 Peter Breitenlohner + + * libttf/pclt.c: Repalce "%02hx" => "%02x" for unsigned char. + 2014-06-16 Peter Breitenlohner * Makefile.am: Drop the obsolete ACLOCAL_AMFLAGS. diff --git a/Build/source/texk/ttfdump/libttf/pclt.c b/Build/source/texk/ttfdump/libttf/pclt.c index 02e562afc3c..73bbaf7ddd9 100644 --- a/Build/source/texk/ttfdump/libttf/pclt.c +++ b/Build/source/texk/ttfdump/libttf/pclt.c @@ -76,7 +76,7 @@ void ttfPrintPCLT(FILE *fp,PCLTPtr pclt) fprintf(fp,"\t characterComplement 0x"); for (i=0;i<8;i++) - fprintf(fp,"%02hx",(unsigned char)pclt->CharacterComplement[i]); + fprintf(fp,"%02x",(unsigned char)pclt->CharacterComplement[i]); fprintf(fp,"\n"); fprintf(fp,"\t fileName \t "); diff --git a/Build/source/texk/web2c/synctexdir/ChangeLog b/Build/source/texk/web2c/synctexdir/ChangeLog index 6afbeac7c2b..f1bda4c4a0e 100644 --- a/Build/source/texk/web2c/synctexdir/ChangeLog +++ b/Build/source/texk/web2c/synctexdir/ChangeLog @@ -1,3 +1,7 @@ +2014-12-10 Peter Breitenlohner + + * synctex.c: Define SYNCTEX_YES as 1, not -1 (for bitfields). + 2014-08-04 Peter Breitenlohner * synctex_parser.c: Declare functions with file scope as static. diff --git a/Build/source/texk/web2c/synctexdir/synctex.c b/Build/source/texk/web2c/synctexdir/synctex.c index bc52ed6219f..4b0eb09bbd3 100644 --- a/Build/source/texk/web2c/synctexdir/synctex.c +++ b/Build/source/texk/web2c/synctexdir/synctex.c @@ -330,7 +330,7 @@ mem[NODE+TYPE##_node_size-synchronization_field_size+1].cint # include "synctex.h" -# define SYNCTEX_YES (-1) +# define SYNCTEX_YES (1) # define SYNCTEX_NO (0) # define SYNCTEX_NO_ERROR (0) diff --git a/Build/source/texk/xdvik/ChangeLog b/Build/source/texk/xdvik/ChangeLog index 1ee7d107bf1..357af7a17ae 100644 --- a/Build/source/texk/xdvik/ChangeLog +++ b/Build/source/texk/xdvik/ChangeLog @@ -1,3 +1,8 @@ +2014-12-10 Peter Breitenlohner + + * xdvi.c (set_windowsize): Use "%u" to print unsigned int. + * hypertex.h: Correct typo in spelling of header guard. + 2014-06-23 Peter Breitenlohner * encodings.c: Do not compile close_iconv() when not used. diff --git a/Build/source/texk/xdvik/hypertex.h b/Build/source/texk/xdvik/hypertex.h index f103b45ef4e..43dcb987197 100644 --- a/Build/source/texk/xdvik/hypertex.h +++ b/Build/source/texk/xdvik/hypertex.h @@ -21,7 +21,7 @@ */ #ifndef HYPERTEX_H_ -#define HTEXTEX_H_ +#define HYPERTEX_H_ /* fallbacks if parsing user-specified colors fails */ #define LINK_COLOR_FALLBACK "BLUE2" diff --git a/Build/source/texk/xdvik/xdvi.c b/Build/source/texk/xdvik/xdvi.c index 4bf3a4642be..cd749c54a30 100644 --- a/Build/source/texk/xdvik/xdvi.c +++ b/Build/source/texk/xdvik/xdvi.c @@ -1270,7 +1270,7 @@ set_windowsize(Dimension *ret_w, Dimension *ret_h, int add_w, int add_h, Boolean /* warn about bad values */ if (flags & WidthValue) { if (width > (unsigned int)(2 * bwidth + add_w)) { - TRACE_GUI((stderr, "width: %hu, bwidth: %hu, add_w: %d", + TRACE_GUI((stderr, "width: %u, bwidth: %hu, add_w: %d", width, bwidth, add_w)); reply.width = width - 2 * bwidth - add_w; } @@ -1280,7 +1280,7 @@ set_windowsize(Dimension *ret_w, Dimension *ret_h, int add_w, int add_h, Boolean } if (flags & HeightValue) { if (height > (unsigned int)(2 * bwidth + add_h)) { - TRACE_GUI((stderr, "height: %hu, bwidth: %hu, add_h: %d", + TRACE_GUI((stderr, "height: %u, bwidth: %hu, add_h: %d", height, bwidth, add_h)); reply.height = height - 2 * bwidth - add_h; } -- cgit v1.2.3