external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-02-15 04:32:24 +00:00
Code Issues Releases Wiki Activity

Patches for dtscreen, dtsearchpath, dtsession on OBSD.

Browse source 
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)
This commit is contained in:
Pascal Stumpf 2012-08-11 14:04:50 +02:00 committed by Jon Trulson
parent 43bae997c8
commit 71f3ed16f8
5 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cde/programs/dtscreen/usleep.c
View file

@ -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)
{

2
cde/programs/dtscreen/worm.c
View file

@ -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

4
cde/programs/dtsearchpath/libCliSrv/UnixEnv.C
View file

@ -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;

2
cde/programs/dtsession/SmConMgmt.c
View file

@ -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;

4
cde/programs/dtsession/SmGlobals.c
View file

@ -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();