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 1b7a6e3e5fb182613c93a795de12855eaf839dd0..d6df465775242a8d5e4edc87f730e9eee827cd04 100644 (file)
--- a/cde/programs/dtprintinfo/objects/BaseObj.h
+++ b/cde/programs/dtprintinfo/objects/BaseObj.h
@@ -16,7 +16,7 @@
  * details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with these librararies and programs; if not, write
+ * License along with these libraries and programs; if not, write
  * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
  * Floor, Boston, MA 02110-1301 USA
  */
@@ -36,15 +36,28 @@
 
 #ifndef _BOOLEAN_
 #define _BOOLEAN_
-#if (defined(sun) && OSMAJORVERSION <= 5 && OSMINORVERSION <= 3)|| defined(USL) || defined(__uxp__)
+#if (defined(sun) && OSMAJORVERSION <= 5 && OSMINORVERSION <= 3)
   #include <sys/types.h>
   #define boolean boolean_t
   #define true B_TRUE
   #define false B_FALSE
-#elif defined(linux)
+#elif defined(sun)
+  #include <sys/types.h>
+  #define boolean boolean_t
+#if defined(__XOPEN_OR_POSIX)
+  #define true _B_TRUE
+  #define false _B_FALSE
+#else
+  #define true B_TRUE
+  #define false B_FALSE
+#endif
+#elif defined(__linux__)
   #define false 0
-  #define true 0
+  #define true 1
   #define boolean int
+#elif defined(CSRG_BASED)
+#include <stdbool.h>
+#define boolean bool
 #else
   typedef enum
   {
@@ -260,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);