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

https://sourceforge.net/p/cdesktopenv/code/merge-requests/16/

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 )

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
 		    );
 	}
 

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;