dtwm: Resolved some compiler warnings

diff --git a/cde/include/Xm/XmPrivate.h b/cde/include/Xm/XmPrivate.h
index aaa8b2c7520270edc1eb0366c5f594adc09967f0..2c06dd221c92b549c0e3ad831b7cb77bb6cdf95b 100644 (file)
--- a/cde/include/Xm/XmPrivate.h
+++ b/cde/include/Xm/XmPrivate.h
@@ -131,6 +131,11 @@ extern void _XmPrimitiveFocusIn(
                         XEvent *event,
                         String *params,
                         Cardinal *num_params) ;
+extern void _XmEnterGadget(
+                        Widget wid,
+                        XEvent *event,
+                        String *params,
+                        Cardinal *num_params);
 extern void _XmLeaveGadget(
                         Widget wid,
                         XEvent *event,
@@ -192,6 +197,15 @@ extern XtPointer _XmStringUngenerate (XmString string,
                        XmStringTag tag,
                        XmTextType tag_type,
                        XmTextType output_type);
+
+/* Extracted from VirtKeysI.h */
+extern Boolean _XmVirtKeysLoadFileBindings(
+                        char *fileName,
+                        String *binding) ;
+extern int _XmVirtKeysLoadFallbackBindings(
+                       Display *display,
+                       String *binding) ;
+
 #ifdef __cplusplus
 }
 #endif

diff --git a/cde/programs/dtwm/Button.c b/cde/programs/dtwm/Button.c
index 1f406a347633cea532ae539c1bdf18cda4d5b469..6549848bfe4291a07abd965f06b4a3177fef9b34 100644 (file)
--- a/cde/programs/dtwm/Button.c
+++ b/cde/programs/dtwm/Button.c
@@ -757,7 +757,7 @@ InputDispatch(
             event_mask & XmMULTI_ARM_EVENT)
         {
            if (event->button == Button1)
-             Arm (w, (XEvent*) event, (String *)NULL, (Cardinal)0);
+             Arm (w, (XEvent*) event, (String *)NULL, (Cardinal*)NULL);
         }
         else if (event_mask & XmACTIVATE_EVENT ||
                  event_mask & XmMULTI_ACTIVATE_EVENT)
@@ -770,28 +770,28 @@ InputDispatch(
                          event->y <= (Position)(G_Y (bg) + G_Height (bg)))
                    {
                         Activate (w, (XEvent*) event,
-                                  (String *)NULL, (Cardinal)0);
+                                  (String *)NULL, (Cardinal*)NULL);
                         Disarm (w, (XEvent*) event,
-                                 (String *)NULL, (Cardinal)0);
+                                 (String *)NULL, (Cardinal*)NULL);
                    }
                    else
                         Disarm (w, (XEvent*) event,
-                                 (String *)NULL, (Cardinal)0);
+                                 (String *)NULL, (Cardinal*)NULL);
                 }
         }
         else if (event_mask & XmHELP_EVENT)
                 _XmSocorro (w, (XEvent *)event,
-                                     (String *)NULL,(Cardinal)0);
+                                     (String *)NULL,(Cardinal*)NULL);
         else if (event_mask & XmENTER_EVENT)
-                Enter (w, (XEvent *)event, (String *)NULL,(Cardinal)0);
+                Enter (w, (XEvent *)event, (String *)NULL,(Cardinal*)NULL);
         else if (event_mask & XmLEAVE_EVENT)
-                Leave (w, (XEvent *)event, (String *)NULL,(Cardinal)0);
+                Leave (w, (XEvent *)event, (String *)NULL,(Cardinal*)NULL);
         else if (event_mask & XmFOCUS_IN_EVENT)
                 _XmFocusInGadget (w, (XEvent *)event,
-                                    (String *)NULL,(Cardinal)0);
+                                    (String *)NULL,(Cardinal*)NULL);
         else if (event_mask & XmFOCUS_OUT_EVENT)
                 _XmFocusOutGadget (w, (XEvent *)event,
-                                    (String *)NULL,(Cardinal)0);
+                                    (String *)NULL,(Cardinal*)NULL);
 }
 
 
@@ -860,7 +860,7 @@ Enter(
 {
    DtButtonGadget bg = (DtButtonGadget) wid ;
 
-   _XmEnterGadget (wid, (XEvent *)event, (String *)NULL,(Cardinal *)0);
+   _XmEnterGadget (wid, (XEvent *)event, (String *)NULL,(Cardinal *)NULL);
 
    if (B_Armed (bg))
       B_Expose (wid, event, NULL);

diff --git a/cde/programs/dtwm/Clock.c b/cde/programs/dtwm/Clock.c
index 0bc38a8585caa2cbc8599d66d569585d2c18bba9..36eda211bf3954aa2b9987896ba6cdbd04a5e742 100644 (file)
--- a/cde/programs/dtwm/Clock.c
+++ b/cde/programs/dtwm/Clock.c
@@ -933,7 +933,7 @@ Draw(
           if (g->clock.numseg != 0)
                   EraseHands (g, (struct tm *) 0);
 
-          ClockTick ((XtPointer)g, (XtIntervalId)0);
+          ClockTick ((XtPointer)g, (XtIntervalId*)NULL);
 
    /*  Draw shadow.
    */

diff --git a/cde/programs/dtwm/WmOL.c b/cde/programs/dtwm/WmOL.c
index f40fe7701fdc0c8e7821378df7340edc77b28b34..2e14c923b36cfce80c2cb17833e6bf65ba4ec281 100644 (file)
--- a/cde/programs/dtwm/WmOL.c
+++ b/cde/programs/dtwm/WmOL.c
@@ -35,6 +35,7 @@ static char rcsid[] = "$XConsortium: WmOL.c /main/4 1995/11/01 11:45:08 rswiston
 /*
  * Included Files:
  */
+#include <stdlib.h>
 #include "WmGlobal.h"
 #include "WmOL.h"
 #include "WmProperty.h"