dtsession: fix screen saver/locking on linux

[oweals/cde.git] / cde / programs / dtprintinfo / objects / BaseObj.h

diff --git a/cde/programs/dtprintinfo/objects/BaseObj.h b/cde/programs/dtprintinfo/objects/BaseObj.h
index 45b472162c73e783ad0fa831b9522835197b16fa..d6df465775242a8d5e4edc87f730e9eee827cd04 100644 (file)
--- a/cde/programs/dtprintinfo/objects/BaseObj.h
+++ b/cde/programs/dtprintinfo/objects/BaseObj.h
@@ -36,7 +36,7 @@
 
 #ifndef _BOOLEAN_
 #define _BOOLEAN_
-#if (defined(sun) && OSMAJORVERSION <= 5 && OSMINORVERSION <= 3)|| defined(USL)
+#if (defined(sun) && OSMAJORVERSION <= 5 && OSMINORVERSION <= 3)
   #include <sys/types.h>
   #define boolean boolean_t
   #define true B_TRUE
@@ -51,7 +51,7 @@
   #define true B_TRUE
   #define false B_FALSE
 #endif
-#elif defined(linux)
+#elif defined(__linux__)
   #define false 0
   #define true 1
   #define boolean int
@@ -273,7 +273,7 @@ class BaseObj {
    // Dumps object to stdout
    void Dump(boolean verbose = false,
             int level = 0);
-   // Dumps object heirarchy to stdout
+   // Dumps object hierarchy to stdout
    void DumpHierarchy(boolean verbose = false,
                      int level = 0);