Package: dvi2ps
Severity: normal
Tags: patch
When building 'dvi2ps' on amd64 with gcc-4.0,
I get the following error:
gcc -g -O -DPOSIX -Wall -DFREETYPE -DVFLIB -I/usr/include -DKPATHSEA -c -o
virfont.o virfont.c
virfont.c:32: warning: return type defaults to 'int'
virfont.c: In function 'vftype_access':
virfont.c:41: warning: suggest parentheses around assignment used as truth value
virfont.c:42: warning: implicit declaration of function 'strcpy'
virfont.c:42: warning: incompatible implicit declaration of built-in function
'strcpy'
virfont.c: In function 'init_vf_fontinfo':
virfont.c:61: warning: implicit declaration of function 'read_vf_dviinfo'
virfont.c: In function 'init_jvf_fontinfo':
virfont.c:73: warning: implicit declaration of function 'read_jvf_dviinfo'
virfont.c: At top level:
virfont.c:85: warning: return type defaults to 'int'
virfont.c: In function 'read_vf_dviinfo':
virfont.c:87: warning: implicit declaration of function 'read_vf_di'
virfont.c:88: warning: control reaches end of non-void function
virfont.c: At top level:
virfont.c:91: warning: return type defaults to 'int'
virfont.c: In function 'read_jvf_dviinfo':
virfont.c:94: warning: control reaches end of non-void function
virfont.c: At top level:
virfont.c:97: warning: return type defaults to 'int'
virfont.c: In function 'read_vf_di':
virfont.c:121: error: invalid lvalue in assignment
With the attached patch 'dvi2ps' can be compiled
on amd64 using gcc-4.0.
Regards
Andreas Jochens
diff -urN ../tmp-orig/dvi2ps-3.2j/bifont.c ./bifont.c
--- ../tmp-orig/dvi2ps-3.2j/bifont.c 1999-11-01 19:04:19.000000000 +0100
+++ ./bifont.c 2005-03-05 14:20:54.488128016 +0100
@@ -117,7 +117,7 @@
switch (dev_tfm_kind(fe)) {
case MF_KIND_PRINTER:
- bfinfo(fe) = biaccinfo(fe)->bf;
+ fe->finfo = biaccinfo(fe)->bf;
fe->fnt_markchar = null_markchar;
fe->fnt_readfontinfo = read_tfm_fontinfo;
break;
@@ -162,7 +162,7 @@
tfmfi = NEW(struct tfmfntinfo, "tfmfont info");
tfmfi->tfm_bf = bfinfo(fe);
- tfmfinfo(fe) = tfmfi;
+ fe->finfo = tfmfi;
read_tfm_finfo(fe);
dev_tfm_initfe(fe);
(void)enc_read(tfmfi->tfm_bf);
@@ -230,7 +230,7 @@
jsfi->jsubfont = biaccinfo(fe)->jsubf;
jsfi->js_bf = biaccinfo(fe)->bf;
jsfi->js_share = getjsubshare(fe);
- jstfmfinfo(fe) = jsfi;
+ fe->finfo = jsfi;
switch (dev_jstfm_kind(fe)) {
case MF_KIND_PRINTER:
fe->fnt_markchar = null_markchar;
@@ -325,7 +325,7 @@
switch (dev_jfm_kind(fe)) {
case MF_KIND_PRINTER:
- bfinfo(fe) = biaccinfo(fe)->bf;
+ fe->finfo = biaccinfo(fe)->bf;
fe->fnt_markchar = null_markchar;
fe->fnt_readfontinfo = read_jfm_fontinfo;
break;
@@ -381,7 +381,7 @@
jfmfi = NEW(struct jfmfntinfo, "jfmfont info");
jfmfi->jfm_bf = bfinfo(fe);
- jfmfinfo(fe) = jfmfi;
+ fe->finfo = jfmfi;
read_jfm_finfo(fe);
dev_jfm_initfe(fe, id);
dev_jfm_initfontdict(fe);
diff -urN ../tmp-orig/dvi2ps-3.2j/ftfont.c ./ftfont.c
--- ../tmp-orig/dvi2ps-3.2j/ftfont.c 2000-03-02 16:22:19.000000000 +0100
+++ ./ftfont.c 2005-03-05 14:20:54.487128209 +0100
@@ -163,12 +163,12 @@
void read_ft_fontinfo();
if (dev_mf_kind(tfmfinfo(fe)->tfm_bf) == MF_KIND_FT)
- biinifinfo(fe) = alloc_biinif(biaccinfo(fe)->bf);
+ fe->finfo = alloc_biinif(biaccinfo(fe)->bf);
else if ((repfe = dev_get_repfe(biaccinfo(fe)->bf)) == NULL) {
- biinifinfo(fe) = alloc_biinif(biaccinfo(fe)->bf);
+ fe->finfo = alloc_biinif(biaccinfo(fe)->bf);
dev_set_repfe(biinifinfo(fe)->bf, fe);
} else
- biinifinfo(fe) = biinifinfo(repfe);
+ fe->finfo = biinifinfo(repfe);
fe->fnt_markchar = mm_markchar;
fe->fnt_readfontinfo = read_ft_fontinfo;
}
@@ -221,7 +221,7 @@
bii = biinifinfo(fe);
tfmfi = NEW(struct tfmfntinfo, "tfmfont info");
tfmfi->tfm_bf = bii->bf;
- tfmfinfo(fe) = tfmfi;
+ fe->finfo = tfmfi;
read_tfm_finfo(fe);
dev_tfm_initfe(fe);
@@ -435,7 +435,7 @@
int jmm_markchar();
void read_jft_fontinfo();
- biinifinfo(fe) = alloc_jbiinif(biaccinfo(fe)->bf);
+ fe->finfo = alloc_jbiinif(biaccinfo(fe)->bf);
fe->fnt_markchar = jmm_markchar;
fe->fnt_readfontinfo = read_jft_fontinfo;
}
@@ -568,12 +568,12 @@
bii = biinifinfo(fe);
jfmfi = NEW(struct jfmfntinfo, "jfmfont info");
jfmfi->jfm_bf = bii->bf;
- jfmfinfo(fe) = jfmfi;
+ fe->finfo = jfmfi;
read_jfm_finfo(fe);
dev_jft_initfe(fe);
tfmw = dev_jft_begfontdict(fe);
- jftfinfo(fe) = read_jft_finfo(fe, bii, tfmw, TRUE);
+ fe->finfo = read_jft_finfo(fe, bii, tfmw, TRUE);
free((char *)bii);
free((char *)jfmfi->ctype);
diff -urN ../tmp-orig/dvi2ps-3.2j/gffont.c ./gffont.c
--- ../tmp-orig/dvi2ps-3.2j/gffont.c 1999-09-16 20:22:30.000000000 +0200
+++ ./gffont.c 2005-03-05 14:20:54.488128016 +0100
@@ -92,7 +92,7 @@
(void)fseek(fntfp, 20L, SEEK_CUR);
rii = rastinifinfo(fe);
- rastfinfo(fe) = rfi = alloc_rastfinfo(rii->maxc+1, TRUE, rii);
+ fe->finfo = rfi = alloc_rastfinfo(rii->maxc+1, TRUE, rii);
dev_rast_initfe(fe);
/* rfi->designsize = ds; */
/* rfi->magnification = (0.5 + 5.0 * 72.27 * (float)t) / 65536.0; */
diff -urN ../tmp-orig/dvi2ps-3.2j/pkfont.c ./pkfont.c
--- ../tmp-orig/dvi2ps-3.2j/pkfont.c 1999-09-16 20:25:51.000000000 +0200
+++ ./pkfont.c 2005-03-05 14:20:54.487128209 +0100
@@ -85,7 +85,7 @@
(void)fseek(fntfp, 8L, SEEK_CUR); /* hppp,vppp */
rii = rastinifinfo(fe);
- rastfinfo(fe) = rfi = alloc_rastfinfo(rii->maxc+1, TRUE, rii);
+ fe->finfo = rfi = alloc_rastfinfo(rii->maxc+1, TRUE, rii);
#ifdef DEBUG
if (Debug) {
for (i = 0; i <= rii->maxc; i++)
diff -urN ../tmp-orig/dvi2ps-3.2j/rastfont.c ./rastfont.c
--- ../tmp-orig/dvi2ps-3.2j/rastfont.c 1999-09-16 20:26:45.000000000 +0200
+++ ./rastfont.c 2005-03-05 14:15:53.701185446 +0100
@@ -82,7 +82,7 @@
k->mark[i] = FALSE;
k->maxc = 0;
k->corrfact = rastaccinfo(fe)->corrfact;
- rastinifinfo(fe) = k;
+ fe->finfo = k;
}
rast_markchar(c)
diff -urN ../tmp-orig/dvi2ps-3.2j/type1font.c ./type1font.c
--- ../tmp-orig/dvi2ps-3.2j/type1font.c 1999-11-01 19:02:52.000000000 +0100
+++ ./type1font.c 2005-03-05 14:20:54.487128209 +0100
@@ -17,10 +17,10 @@
void read_t1_fontinfo();
if ((repfe = dev_get_repfe(biaccinfo(fe)->bf)) == NULL) {
- biinifinfo(fe) = alloc_biinif(biaccinfo(fe)->bf);
+ fe->finfo = alloc_biinif(biaccinfo(fe)->bf);
dev_set_repfe(biinifinfo(fe)->bf, fe);
} else
- biinifinfo(fe) = biinifinfo(repfe);
+ fe->finfo = biinifinfo(repfe);
fe->fnt_markchar = mm_markchar;
fe->fnt_readfontinfo = read_t1_fontinfo;
}
@@ -38,7 +38,7 @@
bii = biinifinfo(fe);
tfmfi = NEW(struct tfmfntinfo, "tfmfont info");
tfmfi->tfm_bf = bii->bf;
- tfmfinfo(fe) = tfmfi;
+ fe->finfo = tfmfi;
read_tfm_finfo(fe);
dev_tfm_initfe(fe);
diff -urN ../tmp-orig/dvi2ps-3.2j/vflfont.c ./vflfont.c
--- ../tmp-orig/dvi2ps-3.2j/vflfont.c 2000-03-09 10:22:47.000000000 +0100
+++ ./vflfont.c 2005-03-05 14:17:52.162320261 +0100
@@ -58,7 +58,7 @@
int jmm_markchar();
void read_vfl_fontinfo();
- biinifinfo(fe) = alloc_jbiinif(biaccinfo(fe)->bf);
+ fe->finfo = alloc_jbiinif(biaccinfo(fe)->bf);
fe->fnt_markchar = jmm_markchar;
fe->fnt_readfontinfo = read_vfl_fontinfo;
}
@@ -170,12 +170,12 @@
bii = biinifinfo(fe);
jfmfi = NEW(struct jfmfntinfo, "jfmfont info");
jfmfi->jfm_bf = bii->bf;
- jfmfinfo(fe) = jfmfi; /* set only to use in read_jfm_finfo */
+ fe->finfo = jfmfi; /* set only to use in read_jfm_finfo */
read_jfm_finfo(fe);
dev_jft_initfe(fe);
tfmw = dev_jft_begfontdict(fe);
- vflfinfo(fe) = read_vfl_finfo(fe, bii, tfmw, TRUE);
+ fe->finfo = read_vfl_finfo(fe, bii, tfmw, TRUE);
free((char *)bii);
free((char *)jfmfi->ctype);
diff -urN ../tmp-orig/dvi2ps-3.2j/virfont.c ./virfont.c
--- ../tmp-orig/dvi2ps-3.2j/virfont.c 1999-09-16 20:27:48.000000000 +0200
+++ ./virfont.c 2005-03-05 14:20:54.487128209 +0100
@@ -116,7 +116,7 @@
Warning("font = \"%s\",\n-->font checksum = %d,\n-->dvi checksum = %d",
fe->name, fe->c, t);
ds = getuint(fntfp, 4); /* design size */
- virfinfo(fe) = alloc_virfinfo((coding == CODE_NORMAL)
+ fe->finfo = alloc_virfinfo((coding == CODE_NORMAL)
? MAXVFCHAR+1 : NJISCHARS);
for (; (cmd = getuint(fntfp,1)) >= VF_FNT_DEF1 && cmd <= VF_FNT_DEF4; ) {
diff -urN ../tmp-orig/dvi2ps-3.2j/wlfont.c ./wlfont.c
--- ../tmp-orig/dvi2ps-3.2j/wlfont.c 1999-11-03 19:05:49.000000000 +0100
+++ ./wlfont.c 2005-03-05 14:20:54.486128402 +0100
@@ -15,7 +15,7 @@
int jmm_markchar();
void read_wl_fontinfo();
- biinifinfo(fe) = alloc_jbiinif(biaccinfo(fe)->bf);
+ fe->finfo = alloc_jbiinif(biaccinfo(fe)->bf);
fe->fnt_markchar = jmm_markchar;
fe->fnt_readfontinfo = read_wl_fontinfo;
}
@@ -132,12 +132,12 @@
bii = biinifinfo(fe);
jfmfi = NEW(struct jfmfntinfo, "jfmfont info");
jfmfi->jfm_bf = bii->bf;
- jfmfinfo(fe) = jfmfi; /* set only to use in read_jfm_finfo */
+ fe->finfo = jfmfi; /* set only to use in read_jfm_finfo */
read_jfm_finfo(fe);
dev_wl_initfe(fe);
dev_wl_begfontdict(fe);
- wlfinfo(fe) = read_wl_finfo(fe, bii, jfmfi, TRUE);
+ fe->finfo = read_wl_finfo(fe, bii, jfmfi, TRUE);
free((char *)bii);
free((char *)jfmfi->ctype);
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
