From: Peter Howkins <flibble@users.sourceforge.net>
Date: Thu, 12 Apr 2012 18:08:52 +0000 (+0100)
Subject: Linux compilation of ttsnoop (Matthew Howkins)
X-Git-Tag: 2.2.0a~26^2~45
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=aa605c16f3d004dccc8c5e92f41eb3211ec780f8;p=oweals%2Fcde.git

Linux compilation of ttsnoop (Matthew Howkins)

This may contain prexisting 64-bit issues, caused by hammering pointers
into ints.
---

diff --git a/cde/programs/ttsnoop/DtTt.C b/cde/programs/ttsnoop/DtTt.C
index 35afd24a..26315dd0 100644
--- a/cde/programs/ttsnoop/DtTt.C
+++ b/cde/programs/ttsnoop/DtTt.C
@@ -33,7 +33,13 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>
+
+#if defined(linux)
+#include <strstream>
+#else
 #include <strstream.h>
+#endif
+
 #include <Xm/TextF.h>
 #include <Dt/SpinBox.h>
 #include <Dt/HelpDialog.h>
@@ -54,7 +60,7 @@ static unsigned int	dtTtDtSessionsCount	= 0;
 static Tt_pattern **	dtTtDtFiles		= 0;
 static unsigned int	dtTtDtFilesCount	= 0;
 
-int		_DtTtPatsNameKey	= (int)DtTtNth;
+int		_DtTtPatsNameKey	= (int) (long) DtTtNth;
 extern Tt_pattern	snoopPat;
 
 int
diff --git a/cde/programs/ttsnoop/argChooser_stubs.C.src b/cde/programs/ttsnoop/argChooser_stubs.C.src
index 50bd7884..52028a3f 100644
--- a/cde/programs/ttsnoop/argChooser_stubs.C.src
+++ b/cde/programs/ttsnoop/argChooser_stubs.C.src
@@ -394,12 +394,12 @@ argOkayed(
 
     XtPointer pval;
     XtVaGetValues( instance->argChooserOkButton, XmNuserData, &pval, 0 );
-    choice = (_DtArgChooserAction)pval;
+    choice = (_DtArgChooserAction) (long) pval;
     XtVaGetValues( instance->argChooserCancelButton, XmNuserData, &pval, 0 );
     msg = (Tt_message)pval;
     pat = (Tt_pattern)pval;
     XtVaGetValues( instance->argChooserHelpButton, XmNuserData, &pval, 0 );
-    nth = (int)pval;
+    nth = (int) (long) pval;
 
     char *vtype = XmTextFieldGetString( instance->vtypeText );
     if ((vtype != 0) && (vtype[0] == '\0')) {
@@ -469,7 +469,7 @@ argHelp(
 	    (DtbArgChooserArgChooserInfo)clientData;
     XtPointer val;
     XtVaGetValues( instance->argChooserOkButton, XmNuserData, &val, 0 );
-    _DtArgChooserAction choice = (_DtArgChooserAction)val;
+    _DtArgChooserAction choice = (_DtArgChooserAction) (long) val;
     Widget label = dtb_ttsnoop_ttsnoop_win.ttsnoopWin_label;
     switch (choice) {
 	case _DtArgChoosePatternArgAdd:
diff --git a/cde/programs/ttsnoop/callbackChooser_stubs.C.src b/cde/programs/ttsnoop/callbackChooser_stubs.C.src
index 6e4ffc70..a67436b8 100644
--- a/cde/programs/ttsnoop/callbackChooser_stubs.C.src
+++ b/cde/programs/ttsnoop/callbackChooser_stubs.C.src
@@ -40,8 +40,14 @@
  *** Add include files, types, macros, externs, and user functions here.
  ***/
 
+#if defined(linux)
+#include <fstream>
+#include <strstream>
+#else
 #include <fstream.h>
 #include <strstream.h>
+#endif
+
 #include "DtTt.h"
 
 extern ofstream snoopStream;
@@ -100,7 +106,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 );
@@ -669,7 +675,7 @@ callbackOkayed(
     XtPointer xtPtr = 0;
     int isMessage = 0;
     XtVaGetValues( instance->callbackAddButton, XmNuserData, &xtPtr, 0 );
-    isMessage = (int)xtPtr;
+    isMessage = (int) (long) xtPtr;
     XtVaGetValues( instance->callbackAddCancelButton, XmNuserData, &xtPtr, 0 );
     msg = (Tt_message)xtPtr;
     pat = (Tt_pattern)xtPtr;
@@ -750,7 +756,7 @@ callbackHelp(
     XtPointer xtPtr = 0;
     int isMessage = 0;
     XtVaGetValues( instance->callbackAddButton, XmNuserData, &xtPtr, 0 );
-    isMessage = (int)xtPtr;
+    isMessage = (int) (long) xtPtr;
     Widget label = dtb_ttsnoop_ttsnoop_win.ttsnoopWin_label;
     if (isMessage) {
 	    _DtMan( label, "tt_message_callback_add" );
diff --git a/cde/programs/ttsnoop/fileChooser_stubs.C.src b/cde/programs/ttsnoop/fileChooser_stubs.C.src
index f836acf9..bb8c4614 100644
--- a/cde/programs/ttsnoop/fileChooser_stubs.C.src
+++ b/cde/programs/ttsnoop/fileChooser_stubs.C.src
@@ -38,8 +38,15 @@
 #include <unistd.h>
 #include <sys/wait.h>
 #include <Xm/TextF.h>
+
+#if defined(linux)
+#include <fstream>
+#include <strstream>
+#else
 #include <fstream.h>
 #include <strstream.h>
+#endif
+
 #include "DtTt.h"
 #include "ttsnoop_ui.h"
 
@@ -155,7 +162,7 @@ snoopFileMsg(
 {
 	tt_free( pathname );
 	DtTtCreated( DTTT_MESSAGE, msg );
-	snoopIt( "Ttdt_file_cb", snoopFileMsg, msg );
+	snoopIt( "Ttdt_file_cb", (void *) snoopFileMsg, msg );
 	if (   (tt_message_class( msg ) == TT_REQUEST)
 	    && (tt_message_state( msg ) == TT_SENT))
 	{
diff --git a/cde/programs/ttsnoop/messageProps_stubs.C.src b/cde/programs/ttsnoop/messageProps_stubs.C.src
index f7132a00..9a139580 100644
--- a/cde/programs/ttsnoop/messageProps_stubs.C.src
+++ b/cde/programs/ttsnoop/messageProps_stubs.C.src
@@ -40,12 +40,17 @@
  *** Add include files, types, macros, externs, and user functions here.
  ***/
 
+#if defined(linux)
+#include <strstream>
+#else
 #include <strstream.h>
+#endif
+
 #include <Xm/TextF.h>
 #include <Dt/SpinBox.h>
 #include "DtTt.h"
 
-int		DtTtMsgWidgetKey	= (int)DtTtMessageWidget;
+int		DtTtMsgWidgetKey	= (int) (long) DtTtMessageWidget;
 int		DtTtMsgUpdateCBKey	= DtTtMsgWidgetKey + 1;
 int		DtTtMsgInfoKey		= DtTtMsgWidgetKey + 2;
 
@@ -100,7 +105,7 @@ _DtTtMessageUpdating(
 	Tt_message msg
 )
 {
-	void *updating = tt_message_user( msg, (int)_DtTtMessageUpdating );
+	void *updating = tt_message_user( msg, (int) (long) _DtTtMessageUpdating );
 	if (tt_is_err( tt_ptr_error( updating ))) {
 		return False;
 	}
@@ -113,7 +118,7 @@ _DtTtMessageSetUpdating(
 	Boolean				updating
 )
 {
-	tt_message_user_set( msg, (int)_DtTtMessageUpdating,
+	tt_message_user_set( msg, (int) (long) _DtTtMessageUpdating,
 			     (void *)updating );
 }
 
@@ -603,7 +608,7 @@ DtTtMessageWidgetCreate(
 	}
 	if (notifyProc != 0) {
 		status = tt_message_user_set( msg, DtTtMsgUpdateCBKey,
-					      notifyProc );
+					      (void *) notifyProc );
 		if (tt_is_err( status )) {
 			XtDestroyWidget( widget );
 			return (Widget)tt_error_pointer( status );
diff --git a/cde/programs/ttsnoop/patternProps_stubs.C.src b/cde/programs/ttsnoop/patternProps_stubs.C.src
index d91426ed..f7a7ce5f 100644
--- a/cde/programs/ttsnoop/patternProps_stubs.C.src
+++ b/cde/programs/ttsnoop/patternProps_stubs.C.src
@@ -40,11 +40,16 @@
  *** Add include files, types, macros, externs, and user functions here.
  ***/
 
+#if defined(linux)
+#include <strstream>
+#else
 #include <strstream.h>
+#endif
+
 #include <Tt/tttk.h>
 #include "DtTt.h"
 
-int		DtTtPatWidgetKey	= (int)DtTtPatternWidget;
+int		DtTtPatWidgetKey	= (int) (long) DtTtPatternWidget;
 int		DtTtPatInfoKey		= DtTtPatWidgetKey + 1;
 
 Tt_pattern
@@ -63,7 +68,7 @@ _DtTtPatternUpdating(
 	Tt_pattern pat
 )
 {
-	void *updating = tt_pattern_user( pat, (int)_DtTtPatternUpdating );
+	void *updating = tt_pattern_user( pat, (int) (long) _DtTtPatternUpdating );
 	if (tt_is_err( tt_ptr_error( updating ))) {
 		return False;
 	}
@@ -76,7 +81,7 @@ _DtTtPatternSetUpdating(
 	Boolean				updating
 )
 {
-	tt_pattern_user_set( pat, (int)_DtTtPatternUpdating,
+	tt_pattern_user_set( pat, (int) (long) _DtTtPatternUpdating,
 			     (void *)updating );
 }
 
diff --git a/cde/programs/ttsnoop/sessionChooser_stubs.C.src b/cde/programs/ttsnoop/sessionChooser_stubs.C.src
index 9df5f7f2..8a748854 100644
--- a/cde/programs/ttsnoop/sessionChooser_stubs.C.src
+++ b/cde/programs/ttsnoop/sessionChooser_stubs.C.src
@@ -41,8 +41,15 @@
  ***/
 
 #include <Xm/TextF.h>
+
+#if defined(linux)
+#include <fstream>
+#include <strstream>
+#else
 #include <fstream.h>
 #include <strstream.h>
+#endif
+
 #include "DtTt.h"
 
 extern ofstream snoopStream;
@@ -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))
 	{
@@ -203,7 +210,7 @@ sessionOK(
     }
     XtPointer val;
     XtVaGetValues( instance->sessionOkButton, XmNuserData, &val, 0 );
-    _DtSessionChooserAction choice = (_DtSessionChooserAction)val;
+    _DtSessionChooserAction choice = (_DtSessionChooserAction) (long) val;
     XtVaGetValues( instance->sessionCancelButton, XmNuserData, &val, 0 );
     Widget label = dtb_ttsnoop_ttsnoop_win.ttsnoopWin_label;
     switch (choice) {
@@ -261,7 +268,7 @@ sessionHelp(
 	    (DtbSessionChooserSessionChooserInfo)clientData;
     XtPointer val;
     XtVaGetValues( instance->sessionOkButton, XmNuserData, &val, 0 );
-    _DtSessionChooserAction choice = (_DtSessionChooserAction)val;
+    _DtSessionChooserAction choice = (_DtSessionChooserAction) (long) val;
     Widget label = dtb_ttsnoop_ttsnoop_win.ttsnoopWin_label;
     switch (choice) {
 	case _DtSessionChoosePattern:
diff --git a/cde/programs/ttsnoop/stringChooser_stubs.C.src b/cde/programs/ttsnoop/stringChooser_stubs.C.src
index cbb97135..894e7e98 100644
--- 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)
+#include <fstream>
+#else
 #include <fstream.h>
+#endif
+
 #include "DtTt.h"
 
 extern ofstream snoopStream;
@@ -237,7 +243,7 @@ stringOkayed(
     }
     XtPointer val;
     XtVaGetValues( instance->stringOkButton, XmNuserData, &val, 0 );
-    _DtStringChooserAction choice = (_DtStringChooserAction)val;
+    _DtStringChooserAction choice = (_DtStringChooserAction) (long) val;
     XtVaGetValues( instance->stringCancelButton, XmNuserData, &val, 0 );
     Widget label = dtb_ttsnoop_ttsnoop_win.ttsnoopWin_label;
     switch (choice) {
@@ -322,7 +328,7 @@ stringHelp(
 	    (DtbStringChooserStringChooserInfo)clientData;
     XtPointer val;
     XtVaGetValues( instance->stringOkButton, XmNuserData, &val, 0 );
-    _DtStringChooserAction choice = (_DtStringChooserAction)val;
+    _DtStringChooserAction choice = (_DtStringChooserAction) (long) val;
     Widget label = dtb_ttsnoop_ttsnoop_win.ttsnoopWin_label;
     switch (choice) {
 	case _DtStringChoosePatternOp:
diff --git a/cde/programs/ttsnoop/ttChooser_stubs.C.src b/cde/programs/ttsnoop/ttChooser_stubs.C.src
index cf6dbff4..4c7711d8 100644
--- a/cde/programs/ttsnoop/ttChooser_stubs.C.src
+++ b/cde/programs/ttsnoop/ttChooser_stubs.C.src
@@ -41,7 +41,13 @@
  ***/
 
 #include <stdio.h>
+
+#if defined(linux)
+#include <strstream>
+#else
 #include <strstream.h>
+#endif
+
 #include <Xm/TextF.h>
 #include <Xm/List.h>
 #include "DtTt.h"
diff --git a/cde/programs/ttsnoop/tt_c++.h b/cde/programs/ttsnoop/tt_c++.h
index 91859c5e..f10b59bb 100644
--- a/cde/programs/ttsnoop/tt_c++.h
+++ b/cde/programs/ttsnoop/tt_c++.h
@@ -29,7 +29,13 @@
 #ifndef TT_CXX_H
 #define TT_CXX_H
 
+#if defined(linux)
+#include <iostream>
+using namespace std;
+#else
 #include <iostream.h>
+#endif
+
 #include <Tt/tt_c.h>
 
 ostream &	operator<<( ostream &, Tt_status );
diff --git a/cde/programs/ttsnoop/ttsnoop.C.src b/cde/programs/ttsnoop/ttsnoop.C.src
index 186600c3..e63e2068 100644
--- a/cde/programs/ttsnoop/ttsnoop.C.src
+++ b/cde/programs/ttsnoop/ttsnoop.C.src
@@ -62,9 +62,17 @@
 #include <sys/wait.h>
 #include <sys/stat.h>
 #include <time.h>
+
+#if defined(linux)
+#include <iostream>
+#include <strstream>
+#include <fstream>
+#else
 #include <iostream.h>
 #include <strstream.h>
 #include <fstream.h>
+#endif
+
 #include <Dt/Term.h>
 #include <Tt/tt_c.h>
 #include <Tt/tttk.h>
@@ -188,7 +196,7 @@ signalHandler(
 	}
 }
 
-#if defined(SVR4) || defined(aix) || defined(hpux) || defined(__osf__)
+#if defined(SVR4) || defined(aix) || defined(hpux) || defined(__osf__) || defined(linux)
 #if !defined(SIG_PF)
 typedef void (*sig_pf_t)(int);
 #define SIG_PF sig_pf_t
@@ -200,7 +208,7 @@ _tt_sigset(
 	int     sig,
 	SIG_PF  handler )
 {
-#if defined(hpux)
+#if defined(hpux) || defined(linux)
 	struct sigaction act;
 	act.sa_handler = handler;
 	sigemptyset(&act.sa_mask);
@@ -266,7 +274,7 @@ justSnoopIt(
 )
 {
 	DtTtCreated( DTTT_MESSAGE, msg ); // XXX bad idea?
-	snoopIt( "Tt_callback_action", justSnoopIt, msg, pat, True );
+	snoopIt( "Tt_callback_action", (void *) justSnoopIt, msg, pat, True );
 	return TT_CALLBACK_PROCESSED;
 }
 
@@ -285,7 +293,7 @@ _DtTtMediaLoadPatCb(
 	tt_free( (caddr_t)contents );
 	tt_free( file );
 	tt_free( docname );
-	snoopIt( "Ttmedia_load_pat_cb", _DtTtMediaLoadPatCb, msg );
+	snoopIt( "Ttmedia_load_pat_cb", (void *) _DtTtMediaLoadPatCb, msg );
 	return 0;
 }
 
@@ -727,7 +735,7 @@ main(int argc, char **argv)
 		    for (int i = 0; i < opsCount; i++) {
 			    tt_pattern_op_add( pat, ops[i] );
 		    }
-		    for (i = 0; i < sendersCount; i++) {
+		    for (int i = 0; i < sendersCount; i++) {
 			    tt_pattern_sender_add( pat, senders[i] );
 		    }
 		    if (vtype != 0) {
diff --git a/cde/programs/ttsnoop/ttsnoop_stubs.C.src b/cde/programs/ttsnoop/ttsnoop_stubs.C.src
index 905ab1df..3abc2eb0 100644
--- a/cde/programs/ttsnoop/ttsnoop_stubs.C.src
+++ b/cde/programs/ttsnoop/ttsnoop_stubs.C.src
@@ -36,8 +36,15 @@
  ***/
 
 #include <unistd.h>
+
+#if defined(linux)
+#include <fstream>
+#include <strstream>
+#else
 #include <fstream.h>
 #include <strstream.h>
+#endif
+
 #include "apiTracer_ui.h"
 #include "DtTt.h"