OpenBSD fixes for DtPrint and csa.

diff --git a/cde/include/EUSCompat.h b/cde/include/EUSCompat.h
index 31c43b00e44255555598ab4fcb258facd69d6beb..3d85398aac43f4a832d123c11461cb25c6553439 100644 (file)
--- a/cde/include/EUSCompat.h
+++ b/cde/include/EUSCompat.h
@@ -110,7 +110,7 @@ typedef enum {B_FALSE, B_TRUE} boolean_t;
 
 #endif /* HPUX */
 
 
 #endif /* HPUX */
 

-#if defined(linux)
+#if defined(linux) || defined(CSRG_BASED)

 typedef enum {B_FALSE, B_TRUE} boolean_t;
 #define MAXNAMELEN             256
 
 typedef enum {B_FALSE, B_TRUE} boolean_t;
 #define MAXNAMELEN             256
 

diff --git a/cde/lib/DtPrint/PrintSetupB.c b/cde/lib/DtPrint/PrintSetupB.c
index 0c1eb86a50adb332283551b9901a758d1fed5d84..97cf56187687d2d4bba89b4634e2b4bda589e8c1 100644 (file)
--- a/cde/lib/DtPrint/PrintSetupB.c
+++ b/cde/lib/DtPrint/PrintSetupB.c
@@ -46,7 +46,11 @@
 #endif
 
 #include <stdlib.h>
 #endif
 
 #include <stdlib.h>

+#if defined(CSRG_BASED)
+#define MAXINT INT_MAX
+#else

 #include <values.h>
 #include <values.h>

+#endif

 #include <stdio.h>
 
 #include <Xm/XmAll.h>
 #include <stdio.h>
 
 #include <Xm/XmAll.h>


@@ -60,6 +64,7 @@
 #include <Dt/PsubUtilI.h>
 #include <Dt/PrintI.h>
 
 #include <Dt/PsubUtilI.h>
 #include <Dt/PrintI.h>
 

+

 /*
  * ------------------------------------------------------------------------
  * Constant Definitions
 /*
  * ------------------------------------------------------------------------
  * Constant Definitions

diff --git a/cde/lib/csa/agent.wrapbegin b/cde/lib/csa/agent.wrapbegin
index b1cdb339f0178f6140bb4d0f1519f470dd11bdb1..b11af6a217430309f3038ff65c0da3fd2ac0160b 100644 (file)
--- a/cde/lib/csa/agent.wrapbegin
+++ b/cde/lib/csa/agent.wrapbegin
@@ -5,7 +5,7 @@
 #include <rpc/types.h>
 #endif /* HPUX */
 
 #include <rpc/types.h>
 #endif /* HPUX */
 

-#if defined(linux)
+#if defined(linux) || defined(CSRG_BASED)

 # if defined __STDC__
 #  define REDEFINE_STDC
 #  undef __STDC__
 # if defined __STDC__
 #  define REDEFINE_STDC
 #  undef __STDC__

diff --git a/cde/lib/csa/lutil.c b/cde/lib/csa/lutil.c
index 2794832315d5c7586e52ba5673e0a2ef5eb7a420..1191c8617c8d119c782d8828feebd542f25854b6 100644 (file)
--- a/cde/lib/csa/lutil.c
+++ b/cde/lib/csa/lutil.c
@@ -29,6 +29,7 @@
  *  (c) Copyright 1993, 1994 Sun Microsystems, Inc.
  */
 
  *  (c) Copyright 1993, 1994 Sun Microsystems, Inc.
  */
 

+#include <sys/param.h>

 #include <EUSCompat.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <EUSCompat.h>
 #include <stdio.h>
 #include <stdlib.h>