From 5c56c32d176b2d8c000a4e8f8c72d579055ab4e5 Mon Sep 17 00:00:00 2001 From: Jose Rubio Date: Sat, 12 Oct 2019 22:29:44 +0200 Subject: [PATCH] Fixes for a few -Wincompatible-pointer-types --- cde/programs/dtksh/findsym.c | 2 +- cde/programs/dtudcfonted/dtaddcpf/addcpf.c | 3 ++- cde/programs/dtudcfonted/dtgpftobdf/gpftobdf.c | 8 +++++--- cde/programs/dtudcfonted/libfal/_fallcRM.c | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/cde/programs/dtksh/findsym.c b/cde/programs/dtksh/findsym.c index aa4214fb..8f939666 100644 --- a/cde/programs/dtksh/findsym.c +++ b/cde/programs/dtksh/findsym.c @@ -99,5 +99,5 @@ fsym( #endif #endif - return(NULL); + return(0); } diff --git a/cde/programs/dtudcfonted/dtaddcpf/addcpf.c b/cde/programs/dtudcfonted/dtaddcpf/addcpf.c index 2504d992..6ad5b6d5 100644 --- a/cde/programs/dtudcfonted/dtaddcpf/addcpf.c +++ b/cde/programs/dtudcfonted/dtaddcpf/addcpf.c @@ -742,7 +742,8 @@ int num_gr, FalGlyphRegion *gr, int code_no) { - int code, rtn, msize, i, j, dspcode; + int code, rtn, msize, i, j; + long unsigned int dspcode; char *ptn; if ( ( r_gpf->p_width != r_snf->bdf_width ) diff --git a/cde/programs/dtudcfonted/dtgpftobdf/gpftobdf.c b/cde/programs/dtudcfonted/dtgpftobdf/gpftobdf.c index 455d2fc1..87cb16f0 100644 --- a/cde/programs/dtudcfonted/dtgpftobdf/gpftobdf.c +++ b/cde/programs/dtudcfonted/dtgpftobdf/gpftobdf.c @@ -292,9 +292,11 @@ int main( int argc, char *argv[] ) } else { fontname = (char *)0; Anafprop( - fip, fpropPtr, fpropvnPtr, - &fontname, &psprop, &resprop, - &fplistPtr, &fplistNum + fip, fpropPtr, + fpropvnPtr, &fontname, + &fplistPtr, + &psprop, &resprop, + &fplistNum ); } diff --git a/cde/programs/dtudcfonted/libfal/_fallcRM.c b/cde/programs/dtudcfonted/libfal/_fallcRM.c index 478a2835..778180c5 100644 --- a/cde/programs/dtudcfonted/libfal/_fallcRM.c +++ b/cde/programs/dtudcfonted/libfal/_fallcRM.c @@ -63,7 +63,7 @@ mbinit(XPointer state) } static char -mbchar(XPointer state, char *str, char *lenp) +mbchar(XPointer state, char *str, int *lenp) { XlcConv conv = ((State) state)->conv; XlcCharSet charset; -- 2.25.1