Fix warnings on FreeBSD

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

diff --git a/cde/programs/ttsnoop/sessionChooser_stubs.C.src b/cde/programs/ttsnoop/sessionChooser_stubs.C.src
index 9df5f7f23b81058d674fe5fcb13a55085267357a..fa3d78bdafe240b79997519a3adf2b7e1a799a59 100644 (file)
--- a/cde/programs/ttsnoop/sessionChooser_stubs.C.src
+++ b/cde/programs/ttsnoop/sessionChooser_stubs.C.src
@@ -41,11 +41,18 @@
  ***/
 
 #include <Xm/TextF.h>
+
+#if defined(__linux__) || defined(CSRG_BASED) || defined(sun)
+#include <fstream>
+#include <strstream>
+#else
 #include <fstream.h>
 #include <strstream.h>
+#endif
+
 #include "DtTt.h"
 
-extern ofstream snoopStream;
+extern std::ofstream snoopStream;
 
 void
 _DtSessionChooserSet(
@@ -91,10 +98,10 @@ _DtSessionChooserSet(
                        instance, dtb_ttsnoop_ttsnoop_win.ttsnoopWin );
        }
        DtTtSetLabel( instance->sessionOkButton, okString );
-       XtVaSetValues( instance->sessionChooser, XmNtitle, title, 0 );
+       XtVaSetValues( instance->sessionChooser, XmNtitle, title, NULL );
        // Remember dialog mode, entity
-       XtVaSetValues( instance->sessionOkButton, XmNuserData, choice, 0 );
-       XtVaSetValues( instance->sessionCancelButton, XmNuserData, entity, 0 );
+       XtVaSetValues( instance->sessionOkButton, XmNuserData, choice, NULL );
+       XtVaSetValues( instance->sessionCancelButton, XmNuserData, entity, NULL );
        XmTextPosition last =
                XmTextFieldGetLastPosition( instance->sessionText );
        Time when =
@@ -111,7 +118,7 @@ snoopSessionMsg(
 )
 {
        DtTtCreated( DTTT_MESSAGE, msg );
-       snoopIt( "Ttdt_contract_cb", snoopSessionMsg, msg );
+       snoopIt( "Ttdt_contract_cb", (void *) snoopSessionMsg, msg );
        if (   (tt_message_class( msg ) == TT_REQUEST)
            && (tt_message_state( msg ) == TT_SENT))
        {
@@ -202,9 +209,9 @@ sessionOK(
            session = 0;
     }
     XtPointer val;
-    XtVaGetValues( instance->sessionOkButton, XmNuserData, &val, 0 );
-    _DtSessionChooserAction choice = (_DtSessionChooserAction)val;
-    XtVaGetValues( instance->sessionCancelButton, XmNuserData, &val, 0 );
+    XtVaGetValues( instance->sessionOkButton, XmNuserData, &val, NULL );
+    _DtSessionChooserAction choice = (_DtSessionChooserAction) (long) val;
+    XtVaGetValues( instance->sessionCancelButton, XmNuserData, &val, NULL );
     Widget label = dtb_ttsnoop_ttsnoop_win.ttsnoopWin_label;
     switch (choice) {
            Tt_status status;
@@ -260,8 +267,8 @@ sessionHelp(
     DtbSessionChooserSessionChooserInfo        instance =
            (DtbSessionChooserSessionChooserInfo)clientData;
     XtPointer val;
-    XtVaGetValues( instance->sessionOkButton, XmNuserData, &val, 0 );
-    _DtSessionChooserAction choice = (_DtSessionChooserAction)val;
+    XtVaGetValues( instance->sessionOkButton, XmNuserData, &val, NULL );
+    _DtSessionChooserAction choice = (_DtSessionChooserAction) (long) val;
     Widget label = dtb_ttsnoop_ttsnoop_win.ttsnoopWin_label;
     switch (choice) {
        case _DtSessionChoosePattern: