debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use POSIX macros for linux

Browse Source
This commit is contained in:
chase
2018-05-24 16:24:41 -05:00
committed by Jon Trulson
parent 164e695cd0
commit 4f5e7fe5e3
265 changed files with 394 additions and 394 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cde/programs/dtlogin/config/Xconfig.src
View File

@@ -64,7 +64,7 @@ Dtlogin*startup: Xstartup
Dtlogin*reset: Xreset
Dtlogin*setup: Xsetup
#if defined (__hpux) || defined (_AIX) || defined (sun) || defined(CSRG_BASED) || defined(linux)
#if defined (__hpux) || defined (_AIX) || defined (sun) || defined(CSRG_BASED) || defined(__linux__)
Dtlogin*failsafeClient: Xfailsafe
#else
Dtlogin*failsafeClient: /usr/bin/X11/xterm
@@ -79,7 +79,7 @@ XCOMM Dtlogin.exportList: ODMDIR NLSPATH TZ ...
Dtlogin.exportList: ODMDIR NLSPATH TZ
#endif
#if defined(CSRG_BASED) || defined(linux)
#if defined(CSRG_BASED) || defined(__linux__)
Dtlogin.exportList: NLSPATH LANG
#endif
@@ -126,7 +126,7 @@ XCOMM To specify a default user PATH environment variable.
XCOMM
XCOMM Dtlogin*userPath: <path>
#if defined(linux) || defined(CSRG_BASED)
#if defined(__linux__) || defined(CSRG_BASED)
Dtlogin*userPath: /bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:CDE_INSTALLATION_TOP/bin
#endif
@@ -161,7 +161,7 @@ XCOMM To specify how long the Login Manager waits to connect to an X-server.
XCOMM
XCOMM Dtlogin*openTimeout: <seconds>
#if defined(CSRG_BASED) || defined(linux)
#if defined(CSRG_BASED) || defined(__linux__)
Dtlogin*openTimeout: 15
Dtlogin*serverAttempts: 3
Dtlogin*wakeupInterval: 20

2
cde/programs/dtlogin/config/Xfailsafe.src
View File

@@ -54,7 +54,7 @@ XCOMM
XCOMM
XCOMM Set background to default weave.
XCOMM
#if defined(linux)
#if defined(__linux__)
XDIR=/usr/bin
#endif
#if defined(__FreeBSD__)

2
cde/programs/dtlogin/config/Xservers.src
View File

@@ -103,7 +103,7 @@ XCOMM ##########################################################################
* Local local@console /usr/bin/X11/X :0
#elif defined (_NO_CONSOLE)
XCOMM * Local local@console /usr/bin/X11/X :0
#elif defined (linux)
#elif defined (__linux__)
:0 Local local_uid@tty1 root /usr/bin/X :0
#elif defined (__OpenBSD__)
:0 Local local@console /usr/X11R6/bin/X :0

2
cde/programs/dtlogin/config/Xsetup.src
View File

@@ -56,7 +56,7 @@ fi
#ifdef sun
XDIR=/usr/openwin/bin
#elif defined(linux)
#elif defined(__linux__)
XDIR=/usr/bin
#elif defined(__OpenBSD__)
XDIR=/usr/X11R6/bin

4
cde/programs/dtlogin/config/_common.ksh.src
View File

@@ -34,7 +34,7 @@
HASH
#if defined(__OpenBSD__) || defined(__NetBSD__)
pexec=$(LC_TIME=C ps -p $PPID | awk 'NR==2 {print $5}')
#elif defined(linux)
#elif defined(__linux__)
pexec=$(LC_TIME=C /bin/ps -p $PPID 2>/dev/null | awk 'NR==2 {print $4}')
#elif defined(__FreeBSD__)
pexec=$(LC_TIME=C /bin/ps -o comm= -p $PPID 2>/dev/null)
@@ -304,7 +304,7 @@ SetKeyboardMap()
#endif
#endif
#if defined(linux)
#if defined(__linux__)
#ifdef cpp_Xsetup
if [ "$DTXSERVERLOCATION" != "remote" ]; then
fontpath=

2
cde/programs/dtlogin/daemon.c
View File

@@ -77,7 +77,7 @@ BecomeDaemon( void )
* Close standard file descriptors and get rid of controlling tty
*/
#if defined(SYSV) || defined (SVR4) || defined(linux)
#if defined(SYSV) || defined (SVR4) || defined(__linux__)
setpgrp ();
#else
setpgrp (0, getpid());

10
cde/programs/dtlogin/dm.c
View File

@@ -62,7 +62,7 @@
# include <time.h>
# include <utime.h>
# include <pwd.h>
#if defined(linux) || defined(CSRG_BASED) || defined(sun)
#if defined(__linux__) || defined(CSRG_BASED) || defined(sun)
# include <stdarg.h>
#else
# include <varargs.h>
@@ -273,7 +273,7 @@ main( int argc, char **argv )
ScanServers ();
StartDisplays ();
(void) signal (SIGHUP, RescanNotify);
#if !defined(SYSV) || defined(hpux) || defined(_AIX) || defined(linux)
#if !defined(SYSV) || defined(hpux) || defined(_AIX) || defined(__linux__)
(void) signal (SIGCHLD, ChildNotify);
#endif
while (AnyWellKnownSockets() || AnyDisplaysLeft ())
@@ -286,7 +286,7 @@ main( int argc, char **argv )
TrimErrorFile();
#if defined(SYSV) && !defined(hpux) && !defined(_AIX) && !defined(linux)
#if defined(SYSV) && !defined(hpux) && !defined(_AIX) && !defined(__linux__)
WaitForChild ();
#else
WaitForSomething ();
@@ -500,7 +500,7 @@ StopAll( int arg )
int ChildReady = 0;
#if !defined(SYSV) || defined(hpux) || defined(_AIX) || defined(linux) || defined(CSRG_BASED)
#if !defined(SYSV) || defined(hpux) || defined(_AIX) || defined(__linux__) || defined(CSRG_BASED)
static SIGVAL
ChildNotify( int arg )
{
@@ -1482,7 +1482,7 @@ SetTitle( char *name, char *ptr )
#define GETTYPATH "/usr/sbin/getty"
#elif defined(__OpenBSD__)
#define GETTYPATH "/usr/libexec/getty"
#elif defined(__linux)
#elif defined(__linux__)
#define GETTYPATH "/sbin/getty"
#elif !defined (__apollo)
#define GETTYPATH "/etc/getty"

4
cde/programs/dtlogin/dm.h
View File

@@ -200,7 +200,7 @@
***************************************************************************/
/*#if defined(SYSV) && !defined(hpux)*/
#if defined(SYSV) || defined(SVR4) || defined(linux) || defined(CSRG_BASED)
#if defined(SYSV) || defined(SVR4) || defined(__linux__) || defined(CSRG_BASED)
# include <sys/wait.h>
# define waitCode(w) WEXITSTATUS(w)
# define waitSig(w) WTERMSIG(w)
@@ -475,7 +475,7 @@ struct verify_info {
*
***************************************************************************/
#if !defined(linux) && !defined(CSRG_BASED)
#if !defined(__linux__) && !defined(CSRG_BASED)
extern char *sys_errlist[]; /* system error msgs */
extern int sys_nerr; /* system error msgs */
#endif

4
cde/programs/dtlogin/genauth.c
View File

@@ -228,7 +228,7 @@ bitsToBytes (unsigned long bits[2], char bytes[64])
* the OS's random number device.
*/
#if defined(linux) || defined(CSRG_BASED) || defined(sun)
#if defined(__linux__) || defined(CSRG_BASED) || defined(sun)
#define READ_LIMIT (sizeof (long) * 2)
static int
@@ -440,7 +440,7 @@ static int cryptoInited = 0;
int
InitCryptoKey( void )
{
#if defined(linux)
#if defined(__linux__)
/* non-blocking */
char *key_file = "/dev/urandom";
#elif defined(CSRG_BASED) || defined(sun)

4
cde/programs/dtlogin/sysauth.c
View File

@@ -119,7 +119,7 @@
#define generic
#endif
#if defined(linux)
#if defined(__linux__)
# include <shadow.h>
#endif
@@ -1944,7 +1944,7 @@ Authenticate( struct display *d, char *name, char *passwd, char **msg )
p = getpwnam(name);
#if defined(linux)
#if defined(__linux__)
/*
* Use the Linux Shadow Password system to get the crypt()ed password
*/

4
cde/programs/dtlogin/util.c
View File

@@ -344,7 +344,7 @@ CleanUpChild( void )
* has also gotten rid of the controlling terminal there is no great
* harm in not making the sub-daemons as leaders.
*/
#if defined (SYSV) || defined (SVR4) || defined(linux)
#if defined (SYSV) || defined (SVR4) || defined(__linux__)
setpgrp ();
#else
setpgrp (0, getpid ());
@@ -670,7 +670,7 @@ static int
MatchesFileSuffix(const char *filename, const char *suffix)
{
int retval = 0;
#if defined(_AIX) || defined(SVR4) || defined(linux) || defined(CSRG_BASED)
#if defined(_AIX) || defined(SVR4) || defined(__linux__) || defined(CSRG_BASED)
int different = 1;
/*