Fix warnings on FreeBSD

[oweals/cde.git] / cde / programs / ttsnoop / ttChooser_stubs.C.src

diff --git a/cde/programs/ttsnoop/ttChooser_stubs.C.src b/cde/programs/ttsnoop/ttChooser_stubs.C.src
index 4c7711d8f3377cec0c7533261e26f3aebb90c2c8..c6521bd242e2d00c11c3cc7d8b356fd9addf34a5 100644 (file)
--- a/cde/programs/ttsnoop/ttChooser_stubs.C.src
+++ b/cde/programs/ttsnoop/ttChooser_stubs.C.src
@@ -21,6 +21,7 @@
  *  ** DELETE THE GENERATED COMMENTS!                                 **
  */
 
+#include <stdint.h>
 #include <stdio.h>
 #include <Xm/Xm.h>
 #include "dtb_utils.h"
@@ -42,7 +43,7 @@
 
 #include <stdio.h>
 
-#if defined(linux)
+#if defined(__linux__) || defined(CSRG_BASED) || defined(sun)
 #include <strstream>
 #else
 #include <strstream.h>
@@ -208,12 +209,12 @@ _DtTtChooserSet(
     XtVaSetValues( instance->chooserList,
                   XmNitemCount, itemCount,
                   XmNitems, items,
-                  0 );
+                  NULL );
     XmListDeselectAllItems( instance->chooserList );
     XmTextFieldSetString( instance->chooserText, 0 );
-    XtVaSetValues( instance->chooser, XmNtitle, title, 0 );
+    XtVaSetValues( instance->chooser, XmNtitle, title, NULL );
 
-    ostrstream valuesStream;
+    std::ostrstream valuesStream;
     valuesStream << itemCount << " " << valuesLabel;
     if (itemCount != 1) valuesStream << "s";
     valuesStream << ends;
@@ -221,8 +222,8 @@ _DtTtChooserSet(
     delete valuesStream.str();
 
     // Remember dialog mode, entity
-    XtVaSetValues( instance->chooserOkButton, XmNuserData, choice, 0 );
-    XtVaSetValues( instance->chooserCancelButton, XmNuserData, entity, 0 );
+    XtVaSetValues( instance->chooserOkButton, XmNuserData, choice, NULL );
+    XtVaSetValues( instance->chooserCancelButton, XmNuserData, entity, NULL );
 
     XtManageChild( instance->chooser_shellform );
 }
@@ -272,7 +273,7 @@ choiceSelected(
     DtbTtChooserChooserInfo instance = (DtbTtChooserChooserInfo)clientData;
     XmListCallbackStruct *info = (XmListCallbackStruct *)callData;
     int choice;
-    XtVaGetValues( instance->chooserOkButton, XmNuserData, &choice, 0 );
+    XtVaGetValues( instance->chooserOkButton, XmNuserData, &choice, NULL );
     DtTtType type;
     Boolean isString = False;
     switch ((_DtTtChooserAction)choice) {
@@ -314,7 +315,7 @@ choiceSelected(
            break;
     }
     void *entity = DtTtNth( type, info->item_position - 1 );
-    ostrstream entityName;
+    std::ostrstream entityName;
     if (isString) {
            entityName << (char *)entity << ends;
     } else {
@@ -340,7 +341,7 @@ choiceOkayed(
     DtbTtChooserChooserInfo instance = (DtbTtChooserChooserInfo)clientData;
     char *text = XmTextFieldGetString( instance->chooserText );
     int ival;
-    XtVaGetValues( instance->chooserOkButton, XmNuserData, &ival, 0 );
+    XtVaGetValues( instance->chooserOkButton, XmNuserData, &ival, NULL );
     _DtTtChooserAction choice = (_DtTtChooserAction)ival;
     Widget label = dtb_ttsnoop_ttsnoop_win.ttsnoopWin_label;
     switch (choice) {
@@ -374,25 +375,25 @@ choiceOkayed(
            break;
        case _DtTtChooserMessageOpSet:
            XtVaGetValues( instance->chooserCancelButton,
-                          XmNuserData, &xtPtr, 0 );
+                          XmNuserData, &xtPtr, NULL );
            _DtTtMessageUpdate( (Tt_message)xtPtr, choice, text );
            XtUnmanageChild( instance->chooser_shellform );
            break;
        case _DtTtChooserPatternOpAdd:
            XtVaGetValues( instance->chooserCancelButton,
-                          XmNuserData, &xtPtr, 0 );
+                          XmNuserData, &xtPtr, NULL );
            _DtTtPatternUpdate( (Tt_pattern)xtPtr, choice, text );
            XtUnmanageChild( instance->chooser_shellform );
            break;
        case _DtTtChooserMessageHandlerSet:
            XtVaGetValues( instance->chooserCancelButton,
-                          XmNuserData, &xtPtr, 0 );
+                          XmNuserData, &xtPtr, NULL );
            _DtTtMessageUpdate( (Tt_message)xtPtr, choice, text );
            XtUnmanageChild( instance->chooser_shellform );
            break;
        case _DtTtChooserPatternSenderAdd:
            XtVaGetValues( instance->chooserCancelButton,
-                          XmNuserData, &xtPtr, 0 );
+                          XmNuserData, &xtPtr, NULL );
            _DtTtPatternUpdate( (Tt_pattern)xtPtr, choice, text );
            XtUnmanageChild( instance->chooser_shellform );
            break;
@@ -403,7 +404,7 @@ choiceOkayed(
            }
            ival = 0;
            sscanf( text, "%i", &ival );
-           msg = (Tt_message)ival;
+           msg = (Tt_message) (intptr_t) ival;
            if (DtTtIndex( DTTT_MESSAGE, msg ) < 0) {
                    return;
            }
@@ -438,7 +439,7 @@ choiceOkayed(
            }
            ival = 0;
            sscanf( text, "%i", &ival );
-           pat = (Tt_pattern)ival;
+           pat = (Tt_pattern) (intptr_t) ival;
            if (DtTtIndex( DTTT_PATTERN, pat ) < 0) {
                    return;
            }
@@ -472,7 +473,7 @@ choiceOkayed(
            }
            ival = 0;
            sscanf( text, "%i", &ival );
-           pats = (Tt_pattern *)ival;
+           pats = (Tt_pattern *) (intptr_t) ival;
            if (DtTtIndex( DTTT_DTSESSION, pats ) < 0) {
                    return;
            }
@@ -498,7 +499,7 @@ choiceOkayed(
            }
            ival = 0;
            sscanf( text, "%i", &ival );
-           pats = (Tt_pattern *)ival;
+           pats = (Tt_pattern *) (intptr_t) ival;
            if (DtTtIndex( DTTT_DTFILE, pats ) < 0) {
                    return;
            }
@@ -592,7 +593,7 @@ ttChooserHelp(
     /*** DTB_USER_CODE_START vvv Add C code below vvv ***/
     DtbTtChooserChooserInfo instance = (DtbTtChooserChooserInfo)clientData;
     int ival;
-    XtVaGetValues( instance->chooserOkButton, XmNuserData, &ival, 0 );
+    XtVaGetValues( instance->chooserOkButton, XmNuserData, &ival, NULL );
     _DtTtChooserAction choice = (_DtTtChooserAction)ival;
     Widget label = dtb_ttsnoop_ttsnoop_win.ttsnoopWin_label;
     switch (choice) {