Fix warnings on FreeBSD

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

diff --git a/cde/programs/ttsnoop/ttsnoop.C.src b/cde/programs/ttsnoop/ttsnoop.C.src
index 72dd8fdf761e3932ad1442e1a327cedab5df78c5..fc1495b1b2a22479acab40607ebc5bc48a54abee 100644 (file)
--- a/cde/programs/ttsnoop/ttsnoop.C.src
+++ b/cde/programs/ttsnoop/ttsnoop.C.src
@@ -63,7 +63,7 @@
 #include <sys/stat.h>
 #include <time.h>
 
-#if defined(linux) || defined(CSRG_BASED)
+#if defined(__linux__) || defined(CSRG_BASED) || defined(sun)
 #include <iostream>
 #include <strstream>
 #include <fstream>
@@ -196,7 +196,7 @@ signalHandler(
        }
 }
 
-#if defined(SVR4) || defined(aix) || defined(hpux) || defined(__osf__) || defined(linux) || defined(CSRG_BASED)
+#if defined(SVR4) || defined(aix) || defined(hpux) || defined(__linux__) || defined(CSRG_BASED)
 #if !defined(SIG_PF)
 typedef void (*sig_pf_t)(int);
 #define SIG_PF sig_pf_t
@@ -208,7 +208,7 @@ _tt_sigset(
        int     sig,
        SIG_PF  handler )
 {
-#if defined(hpux) || defined(linux) || defined(CSRG_BASED)
+#if defined(hpux) || defined(__linux__) || defined(CSRG_BASED)
        struct sigaction act;
        act.sa_handler = handler;
        sigemptyset(&act.sa_mask);
@@ -340,6 +340,9 @@ main(int argc, char **argv)
     XtAppContext       app;
     Atom               save_yourself_atom;
 
+    Pixmap     icon_pixmap = 0;
+    Pixmap     icon_mask_pixmap = 0;
+    
     /**************************************************************************
      *** DTB_USER_CODE_START
      ***
@@ -348,9 +351,6 @@ main(int argc, char **argv)
      *** Add local variables and code.
      ***/
     
-    Pixmap     icon_pixmap = 0;
-    Pixmap     icon_mask_pixmap = 0;
-
     /*
      * The application must call DtTermInitialize() before 
      * initializing the Xt Toolkit with XtAppInitialize(3X).