Fix warnings on FreeBSD

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

diff --git a/cde/programs/ttsnoop/callbackChooser_stubs.C.src b/cde/programs/ttsnoop/callbackChooser_stubs.C.src
index 6e4ffc70aefc84200d67df57d507b3ac1271b189..3e7ba76f188f892e397f1089110c0ffa25d1131c 100644 (file)
--- a/cde/programs/ttsnoop/callbackChooser_stubs.C.src
+++ b/cde/programs/ttsnoop/callbackChooser_stubs.C.src
@@ -21,6 +21,7 @@
  *  ** DELETE THE GENERATED COMMENTS!                                 **
  */
 
+#include <stdlib.h>
 #include <stdio.h>
 #include <Xm/Xm.h>
 #include "dtb_utils.h"
@@ -40,11 +41,17 @@
  *** Add include files, types, macros, externs, and user functions here.
  ***/
 
+#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;
 
 typedef enum {
        DoJustPrint,
@@ -69,11 +76,11 @@ _DtTtMsgCbChooserSet(
                dtb_callback_chooser_callback_chooser_initialize(
                        instance, dtb_ttsnoop_ttsnoop_win.ttsnoopWin );
        }
-       XtVaSetValues( instance->callbackChooser, XmNtitle, title, 0 );
-       XtPointer xtPtr = (XtPointer)isMessage;
-       XtVaSetValues( instance->callbackAddButton, XmNuserData, xtPtr, 0 );
+       XtVaSetValues( instance->callbackChooser, XmNtitle, title, NULL );
+       XtPointer xtPtr = (XtPointer) (intptr_t) isMessage;
+       XtVaSetValues( instance->callbackAddButton, XmNuserData, xtPtr, NULL );
        XtVaSetValues( instance->callbackAddCancelButton,
-                      XmNuserData, entity, 0 );
+                      XmNuserData, entity, NULL );
        XtManageChild( instance->callbackChooser_shellform );
 }
 
@@ -100,7 +107,7 @@ openIt(
 )
 {
        DtTtCreated( DTTT_MESSAGE, msg );
-       snoopIt( "Tt_message_callback", openIt, msg, pat, True );
+       snoopIt( "Tt_message_callback", (void *) openIt, msg, pat, True );
        Widget newWidget = DtTtMessageWidgetCreate(
                            dtb_ttsnoop_ttsnoop_win.ttsnoopWin,
                            msg, DtTtMessageWidgetUpdate );
@@ -668,16 +675,16 @@ callbackOkayed(
     Tt_pattern pat = 0;
     XtPointer xtPtr = 0;
     int isMessage = 0;
-    XtVaGetValues( instance->callbackAddButton, XmNuserData, &xtPtr, 0 );
-    isMessage = (int)xtPtr;
-    XtVaGetValues( instance->callbackAddCancelButton, XmNuserData, &xtPtr, 0 );
+    XtVaGetValues( instance->callbackAddButton, XmNuserData, &xtPtr, NULL );
+    isMessage = (int) (long) xtPtr;
+    XtVaGetValues( instance->callbackAddCancelButton, XmNuserData, &xtPtr, NULL );
     msg = (Tt_message)xtPtr;
     pat = (Tt_pattern)xtPtr;
 
     What2Do action = DoOpen;
     Widget actionWidget;
     XtVaGetValues( instance->msgActionChoice,
-                  XmNmenuHistory, &actionWidget, 0 );
+                  XmNmenuHistory, &actionWidget, NULL );
     if (actionWidget == instance->msgActionChoice_items.Open_item) {
            action = DoOpen;
     } else if (actionWidget == instance->msgActionChoice_items.Print_item) {
@@ -697,7 +704,7 @@ callbackOkayed(
     int destroy = 0;
     Boolean destroyBool;
     XtVaGetValues( instance->msgDestroyChoice_items.Destroy_item,
-                  XmNset, &destroyBool, 0 );
+                  XmNset, &destroyBool, NULL );
     if (destroyBool) {
            destroy = 1;
     }
@@ -705,7 +712,7 @@ callbackOkayed(
     Tt_callback_action returnVal = TT_CALLBACK_CONTINUE;
     Widget returnWidget;
     XtVaGetValues( instance->msgReturnChoice,
-                  XmNmenuHistory, &returnWidget, 0 );
+                  XmNmenuHistory, &returnWidget, NULL );
     if (returnWidget == instance->msgReturnChoice_items.PROCESSED_item) {
            returnVal = TT_CALLBACK_PROCESSED;
     }
@@ -749,8 +756,8 @@ callbackHelp(
            (DtbCallbackChooserCallbackChooserInfo)clientData;
     XtPointer xtPtr = 0;
     int isMessage = 0;
-    XtVaGetValues( instance->callbackAddButton, XmNuserData, &xtPtr, 0 );
-    isMessage = (int)xtPtr;
+    XtVaGetValues( instance->callbackAddButton, XmNuserData, &xtPtr, NULL );
+    isMessage = (int) (long) xtPtr;
     Widget label = dtb_ttsnoop_ttsnoop_win.ttsnoopWin_label;
     if (isMessage) {
            _DtMan( label, "tt_message_callback_add" );