dtpdm: Resolve 4 compiler warnings
authorPeter Howkins <flibble@users.sourceforge.net>
Fri, 31 Aug 2012 20:41:32 +0000 (21:41 +0100)
committerPeter Howkins <flibble@users.sourceforge.net>
Fri, 31 Aug 2012 20:41:32 +0000 (21:41 +0100)
cde/programs/dtpdm/Main.c
cde/programs/dtpdm/PrinterBox.c

index 7fe03641234078ad989b0210981b33952a5421f6..7a59de1ef32da0f3b43564964f3c66bb262b1dea 100644 (file)
@@ -33,6 +33,7 @@
  * (c) Copyright 1996 FUJITSU LIMITED.
  * (c) Copyright 1996 Hitachi.
  */
+#include <stdlib.h>
 #include <Xm/XmAll.h>
 #include <Xm/ColorObjP.h>       /* for Xme Color Obj access API */
 #include <Dt/dtpdmd.h>
index 48ed2c6c7a0816ab736ce3dbd45bb88df372cfaa..d3ff718133be9e0e0c26da0ba77c301fca9ca8a9 100644 (file)
@@ -319,7 +319,7 @@ static void TrayCtlSelectCB(Widget w, XtPointer client_d, XtPointer call_d);
  */
 static SizeCtl* SizeCtlNew();
 static void SizeCtlDelete(SizeCtl* me);
-static int SizeCtlStrColl(void* e1, void* e2);
+static int SizeCtlStrColl(const void* e1, const void* e2);
 static void SizeCtlSetSizeLists(PdmOidList** oids,
                                XmStringTable* xmstrs,
                                PdmOidLinkedList* oids_ll);
@@ -2289,9 +2289,9 @@ SizeCtlDelete(SizeCtl* me)
  *
  */
 static int
-SizeCtlStrColl(void* e1, void* e2)
+SizeCtlStrColl(const void* e1, const void* e2)
 {
-    SizeCtlSortRec *r1 = e1, *r2 = e2;
+    const SizeCtlSortRec *r1 = e1, *r2 = e2;
 
     return strcoll(r1->str, r2->str);
 }