external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-03-09 15:50:02 +00:00
Code Issues Releases Wiki Activity

Merge /u/jrubio/cdesktopenv/ branch incompatible-pointer-types into master

Browse source 
https://sourceforge.net/p/cdesktopenv/code/merge-requests/16/
This commit is contained in:
Jon Trulson 2019-10-12 21:43:45 +00:00
commit 34b5ee08c8
3 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
cde/programs/dtudcfonted/dtaddcpf/addcpf.c
View file

@ -742,7 +742,8 @@ int num_gr,
FalGlyphRegion *gr, FalGlyphRegion *gr,
int code_no) int code_no)
{ {
int code, rtn, msize, i, j, dspcode; int code, rtn, msize, i, j;
long unsigned int dspcode;
char *ptn; char *ptn;
if ( ( r_gpf->p_width != r_snf->bdf_width ) if ( ( r_gpf->p_width != r_snf->bdf_width )

8
cde/programs/dtudcfonted/dtgpftobdf/gpftobdf.c
View file

@ -292,9 +292,11 @@ int main( int argc, char *argv[] )
} else { } else {
fontname = (char *)0; fontname = (char *)0;
Anafprop( Anafprop(
fip, fpropPtr, fpropvnPtr, fip, fpropPtr,
&fontname, &psprop, &resprop, fpropvnPtr, &fontname,
&fplistPtr, &fplistNum &fplistPtr,
&psprop, &resprop,
&fplistNum
); );
} }

2
cde/programs/dtudcfonted/libfal/_fallcRM.c
View file

@ -63,7 +63,7 @@ mbinit(XPointer state)
} }
static char static char
mbchar(XPointer state, char *str, char *lenp) mbchar(XPointer state, char *str, int *lenp)
{ {
XlcConv conv = ((State) state)->conv; XlcConv conv = ((State) state)->conv;
XlcCharSet charset; XlcCharSet charset;