Patches for dtscreen, dtsearchpath, dtsession on OBSD.

Do not redefine round(3), and provide a manpath for OpenBSD.
(this is one of the few things that need to be adjusted for other BSDs)

diff --git a/cde/programs/dtscreen/usleep.c b/cde/programs/dtscreen/usleep.c
index 08490812dced94b052feba1ab4f547c1fc2f8f4f..ca89c5286e1633894fa18067cec8851a1775de1b 100644 (file)
--- a/cde/programs/dtscreen/usleep.c
+++ b/cde/programs/dtscreen/usleep.c
@@ -41,7 +41,7 @@
 
 #include "dtscreen.h"
 
-#if !defined(_AIX) && !defined(hpV4) && !defined(linux)
+#if !defined(_AIX) && !defined(hpV4) && !defined(linux) && !defined(CSRG_BASED)
 int
 usleep(unsigned long usec)
 {

diff --git a/cde/programs/dtscreen/worm.c b/cde/programs/dtscreen/worm.c
index bdf014139326fdf5cc5270b8627f7d5a6b073d2f..a806facc00761feef22cbbd27c4053d075dce429 100644 (file)
--- a/cde/programs/dtscreen/worm.c
+++ b/cde/programs/dtscreen/worm.c
@@ -88,12 +88,14 @@ typedef struct {
     int         size[MAXCOLORS];
 }           wormstruct;
 
+#if !defined(CSRG_BASED)
 int
 round(x)
     float       x;
 {
     return ((int) floor((double) x));
 }
+#endif
 
 
 void

diff --git a/cde/programs/dtsearchpath/libCliSrv/UnixEnv.C b/cde/programs/dtsearchpath/libCliSrv/UnixEnv.C
index 731fe91c8c11aac20d17f6954536bcffa1772d68..1e7fdf11126b1061175f591aa4104f5acb8fb4c9 100644 (file)
--- a/cde/programs/dtsearchpath/libCliSrv/UnixEnv.C
+++ b/cde/programs/dtsearchpath/libCliSrv/UnixEnv.C
@@ -53,7 +53,7 @@
 #endif
 #include <errno.h>
 
-#if defined(sun) || defined(_AIX) || defined(__osf__) || defined(USL) || defined(__uxp__) || (linux)
+#if defined(sun) || defined(_AIX) || defined(__osf__) || defined(USL) || defined(__uxp__) || defined(linux) || defined(CSRG_BASED)
 #define UID_NO_CHANGE ((uid_t) -1)
 #define GID_NO_CHANGE ((gid_t) -1)
 #endif
@@ -80,6 +80,8 @@ UnixEnvironment::UnixEnvironment()
         manpath = "/usr/share/%L/man:/usr/share/man:/usr/local/man";
 #elif defined(linux)
         manpath = "/usr/share/man/%L:/usr/share/man:/usr/contrib/man/%L:/usr/contrib/man:/usr/local/man/%L:/usr/local/man";
+#elif defined(__OpenBSD__)
+       manpath = "/usr/share/man:/usr/X11R6/man:/usr/local/man:/usr/ports/infrastructure/man";
 #endif
     else
        manpath = temp;

diff --git a/cde/programs/dtsession/SmConMgmt.c b/cde/programs/dtsession/SmConMgmt.c
index aa0f678f26f93205e60b8975e009c392373f89c6..23ed57cc3040be3d80248f959295aca1c2a9d890 100644 (file)
--- a/cde/programs/dtsession/SmConMgmt.c
+++ b/cde/programs/dtsession/SmConMgmt.c
@@ -163,7 +163,7 @@ GetMemoryUtilization(void)
 #if !defined(linux)
     static int init = 0;
     static kmem;
-#if !defined(SVR4) && !defined(sco) && !defined(hpV4) && !defined(_POWER) && !defined (__osf__)
+#if !defined(SVR4) && !defined(sco) && !defined(hpV4) && !defined(_POWER) && !defined (__osf__) && !defined(CSRG_BASED)
     extern void nlist();
 #endif
     int i;

diff --git a/cde/programs/dtsession/SmGlobals.c b/cde/programs/dtsession/SmGlobals.c
index 36c351197d55a539a336a687278381ff78da5330..4bda658ee285382f0fa6d6ba3641c361e1bc59d3 100644 (file)
--- a/cde/programs/dtsession/SmGlobals.c
+++ b/cde/programs/dtsession/SmGlobals.c
@@ -1352,7 +1352,7 @@ RemoveFiles(
 
         _DtEnvControl(DT_ENV_RESTORE_PRE_DT);
         
-#ifdef __osf__
+#if defined(__osf__) || defined(CSRG_BASED)
         setsid();
 #else
         (void) setpgrp();
@@ -1457,7 +1457,7 @@ MoveDirectory(
 
         _DtEnvControl(DT_ENV_RESTORE_PRE_DT);
         
-#ifdef __osf__
+#if defined(__osf__) || defined(CSRG_BASED)
         setsid();
 #else
         (void) setpgrp();