Fixes for a few -Wincompatible-pointer-types

diff --git a/cde/programs/dtksh/findsym.c b/cde/programs/dtksh/findsym.c
index aa4214fb2905cb2e755bfefb5e1bb3612c33b549..8f93966616ec20743d54e5272c737438b54f0955 100644 (file)
--- 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 2504d992d9bc78f3562069bac86ad2a8df6225a9..6ad5b6d55253fdb72837461dd7fa4d22cf7b179b 100644 (file)
--- 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 455d2fc11f0ac3449f6d02e14b6d65a1733470dc..87cb16f06e229434e26e4b57ce995f44d9e6d38f 100644 (file)
--- 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 478a2835142fb981430f9280b1268f4138d272c3..778180c5e246bd70f8260cfecab125293a664360 100644 (file)
--- 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;