summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Build/source/texk/makejvf/ChangeLog2
-rw-r--r--Build/source/texk/makejvf/makejvf.h3
-rw-r--r--Build/source/texk/makejvf/tfmread.c6
3 files changed, 5 insertions, 6 deletions
diff --git a/Build/source/texk/makejvf/ChangeLog b/Build/source/texk/makejvf/ChangeLog
index 6dd4d124bcb..b73859f9c21 100644
--- a/Build/source/texk/makejvf/ChangeLog
+++ b/Build/source/texk/makejvf/ChangeLog
@@ -1,6 +1,8 @@
2017-07-20 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
makejvf version 20170720.
+ * tfmread.c, makejvf.h: Declare "rightamount" as signed,
+ to be consistent with "skip" in write.c.
* write.c: Improve -m option for UCS mode.
* version.h: Adjusted.
* makejvf.1: Add documentation of -m option.
diff --git a/Build/source/texk/makejvf/makejvf.h b/Build/source/texk/makejvf/makejvf.h
index 252c66a5911..05e8a4b9c05 100644
--- a/Build/source/texk/makejvf/makejvf.h
+++ b/Build/source/texk/makejvf/makejvf.h
@@ -1,8 +1,7 @@
#define MAX_LIG_STEPS 32510
extern char *vtfmname,*kanatfm,*jistfm,*ucsqtfm;
-extern int unit,zh,zw,jfm_id;
-extern unsigned int rightamount;
+extern int unit,zh,zw,jfm_id,rightamount;
extern int kanatume,chotai,baseshift,minute,hankana,fidzero,enhanced;
extern int pstfm_nt;
extern FILE *afp;
diff --git a/Build/source/texk/makejvf/tfmread.c b/Build/source/texk/makejvf/tfmread.c
index 36bbac46dda..c110e7e8f84 100644
--- a/Build/source/texk/makejvf/tfmread.c
+++ b/Build/source/texk/makejvf/tfmread.c
@@ -5,15 +5,13 @@
#include <stdlib.h>
#include <string.h>
-int nt,unit,zh,zw,jfm_id;
+int nt,unit,zh,zw,jfm_id,rightamount;
int *width,*height,*depth,*italic,*param;
-unsigned int rightamount;
unsigned char *header,*char_type,*char_info,*glue_kern,*kern,*glue;
int jfmread(int kcode)
{
- int i,ctype = 0,w_ind,w,gk_ind,k_ind,g_ind;
- unsigned int ll,rr;
+ int i,ctype = 0,w_ind,w,ll,rr,gk_ind,k_ind,g_ind;
for (i = 0 ; i < nt ; i++) {
if (upair(&char_type[i*4]) == kcode) {