Fix warnings on FreeBSD

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

diff --git a/cde/programs/ttsnoop/stringChooser_stubs.C.src b/cde/programs/ttsnoop/stringChooser_stubs.C.src
index cbb971358b41bee54b7e542244b7fc7bcdfc47b6..27f0fb22ec00f860fe9b1e22b9192e17ea02b9fa 100644 (file)
--- a/cde/programs/ttsnoop/stringChooser_stubs.C.src
+++ b/cde/programs/ttsnoop/stringChooser_stubs.C.src
@@ -41,7 +41,13 @@
  ***/
 
 #include <Xm/TextF.h>
+
+#if defined(__linux__) || defined(CSRG_BASED) || defined(sun)
+#include <fstream>
+#else
 #include <fstream.h>
+#endif
+
 #include "DtTt.h"
 
 extern ofstream snoopStream;
@@ -176,10 +182,10 @@ _DtStringChooserSet(
        }
        DtTtSetLabel( instance->stringOkButton, okString );
        DtTtSetLabel( instance->stringText_label, valueLabel );
-       XtVaSetValues( instance->stringChooser, XmNtitle, title, 0 );
+       XtVaSetValues( instance->stringChooser, XmNtitle, title, NULL );
        // Remember dialog mode, entity
-       XtVaSetValues( instance->stringOkButton, XmNuserData, choice, 0 );
-       XtVaSetValues( instance->stringCancelButton, XmNuserData, entity, 0 );
+       XtVaSetValues( instance->stringOkButton, XmNuserData, choice, NULL );
+       XtVaSetValues( instance->stringCancelButton, XmNuserData, entity, NULL );
        XmTextPosition last = XmTextFieldGetLastPosition( instance->stringText );
        Time when = XtLastTimestampProcessed( XtDisplay( instance->stringText ));
        XmTextFieldSetSelection( instance->stringText, 0, last, when );
@@ -236,9 +242,9 @@ stringOkayed(
            string = 0;
     }
     XtPointer val;
-    XtVaGetValues( instance->stringOkButton, XmNuserData, &val, 0 );
-    _DtStringChooserAction choice = (_DtStringChooserAction)val;
-    XtVaGetValues( instance->stringCancelButton, XmNuserData, &val, 0 );
+    XtVaGetValues( instance->stringOkButton, XmNuserData, &val, NULL );
+    _DtStringChooserAction choice = (_DtStringChooserAction) (long) val;
+    XtVaGetValues( instance->stringCancelButton, XmNuserData, &val, NULL );
     Widget label = dtb_ttsnoop_ttsnoop_win.ttsnoopWin_label;
     switch (choice) {
            Tt_status status;
@@ -321,8 +327,8 @@ stringHelp(
     DtbStringChooserStringChooserInfo instance =
            (DtbStringChooserStringChooserInfo)clientData;
     XtPointer val;
-    XtVaGetValues( instance->stringOkButton, XmNuserData, &val, 0 );
-    _DtStringChooserAction choice = (_DtStringChooserAction)val;
+    XtVaGetValues( instance->stringOkButton, XmNuserData, &val, NULL );
+    _DtStringChooserAction choice = (_DtStringChooserAction) (long) val;
     Widget label = dtb_ttsnoop_ttsnoop_win.ttsnoopWin_label;
     switch (choice) {
        case _DtStringChoosePatternOp: