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

2
cde/programs/dtsearchpath/dtappg/Options.C
View File

@@ -31,7 +31,7 @@
#include "Options.h"
#include <stdlib.h>
#if defined(linux) || defined(CSRG_BASED) || defined(sun)
#if defined(__linux__) || defined(CSRG_BASED) || defined(sun)
#include <iostream>
#else
#include <iostream.h>

2
cde/programs/dtsearchpath/dtappg/dtappgather.C
View File

@@ -75,7 +75,7 @@
#include "dtappgather.h"
#include "DirIterator.h"
#include <stdlib.h>
#if defined(linux) || defined(CSRG_BASED) || defined(sun)
#if defined(__linux__) || defined(CSRG_BASED) || defined(sun)
#include <iostream>
#else
#include <iostream.h>

4
cde/programs/dtsearchpath/dtsp/ManSearchPath.C
View File

@@ -136,7 +136,7 @@ void ManSearchPath::Print()
}
}
#if defined(linux) || defined(CSRG_BASED) || defined(sun)
#if defined(__linux__) || defined(CSRG_BASED) || defined(sun)
std::ostream & operator<<
(
std::ostream & os,
@@ -150,7 +150,7 @@ ostream & operator<<
)
#endif
{
#if defined(linux) || defined(CSRG_BASED) || defined(sun)
#if defined(__linux__) || defined(CSRG_BASED) || defined(sun)
os << sp.GetEnvVar() << std::endl;
#else
os << sp.GetEnvVar() << endl;

2
cde/programs/dtsearchpath/dtsp/Options.C
View File

@@ -33,7 +33,7 @@
#include "Options.h"
#include <stdlib.h>
#if defined(linux) || defined(CSRG_BASED) || defined(sun)
#if defined(__linux__) || defined(CSRG_BASED) || defined(sun)
#include <iostream>
#else
#include <iostream.h>

10
cde/programs/dtsearchpath/dtsp/SearchPath.C
View File

@@ -387,7 +387,7 @@ void SearchPath::Print()
*
****************************************************************/
#if defined(linux) || defined(CSRG_BASED) || defined(sun)
#if defined(__linux__) || defined(CSRG_BASED) || defined(sun)
void SearchPath::PrettyPrint
(
std::ostream & os
@@ -402,14 +402,14 @@ void SearchPath::PrettyPrint
CTokenizedString path (GetSearchPath(), Separator().data());
CString subpath = path.next();
while (!subpath.isNull()) {
#if defined(linux) || defined(CSRG_BASED) || defined(sun)
#if defined(__linux__) || defined(CSRG_BASED) || defined(sun)
os << " " << subpath << std::endl;
#else
os << " " << subpath << endl;
#endif
subpath = path.next();
}
#if defined(linux) || defined(CSRG_BASED) || defined(sun)
#if defined(__linux__) || defined(CSRG_BASED) || defined(sun)
os << std::endl;
#else
os << endl;
@@ -424,7 +424,7 @@ void SearchPath::PrettyPrint
*
****************************************************************/
#if defined(linux) || defined(CSRG_BASED) || defined(sun)
#if defined(__linux__) || defined(CSRG_BASED) || defined(sun)
std::ostream & operator<<
(
std::ostream & os,
@@ -438,7 +438,7 @@ ostream & operator<<
)
#endif
{
#if defined(linux) || defined(CSRG_BASED) || defined(sun)
#if defined(__linux__) || defined(CSRG_BASED) || defined(sun)
os << sp.GetEnvVar() << "SEARCHPATH:" << std::endl;
#else
os << sp.GetEnvVar() << "SEARCHPATH:" << endl;

6
cde/programs/dtsearchpath/dtsp/SearchPath.h
View File

@@ -34,7 +34,7 @@
#include "Environ.h"
#include "cstring.h"
#if defined(linux) || defined(CSRG_BASED) || defined(sun)
#if defined(__linux__) || defined(CSRG_BASED) || defined(sun)
#include <iostream>
#else
#include <iostream.h>
@@ -51,7 +51,7 @@ class SearchPath {
virtual void Print();
virtual void AddPredefinedPath();
#if defined(linux) || defined(CSRG_BASED) || defined(sun)
#if defined(__linux__) || defined(CSRG_BASED) || defined(sun)
virtual void PrettyPrint (std::ostream &) const;
friend std::ostream & operator<< (std::ostream &, const SearchPath &);
@@ -186,7 +186,7 @@ class ManSearchPath : public SearchPath {
virtual void ExportPath ();
virtual void Print();
#if defined(linux) || defined(CSRG_BASED) || defined(sun)
#if defined(__linux__) || defined(CSRG_BASED) || defined(sun)
friend std::ostream & operator<< (std::ostream &, const ManSearchPath &);
#else
friend ostream & operator<< (ostream &, const ManSearchPath &);

6
cde/programs/dtsearchpath/libCliSrv/TTFile.C
View File

@@ -95,7 +95,7 @@ TTFile & TTFile::operator=
return *this;
}
#if defined(linux) || defined(CSRG_BASED) || defined(sun)
#if defined(__linux__) || defined(CSRG_BASED) || defined(sun)
std::ostream & operator<<
(
std::ostream & os,
@@ -110,7 +110,7 @@ ostream & operator<<
#endif
{
if (file.ttFileOpFailed())
#if defined(linux) || defined(CSRG_BASED) || defined(sun)
#if defined(__linux__) || defined(CSRG_BASED) || defined(sun)
return os << "Error in filename mapping; status = "
<< file.getStatus() << std::endl;
#else
@@ -118,7 +118,7 @@ ostream & operator<<
<< file.getStatus() << endl;
#endif
else
#if defined(linux) || defined(CSRG_BASED) || defined(sun)
#if defined(__linux__) || defined(CSRG_BASED) || defined(sun)
return os << file.data() << std::endl;
#else
return os << file.data() << endl;

2
cde/programs/dtsearchpath/libCliSrv/TTFile.h
View File

@@ -65,7 +65,7 @@ class TTFile : public CString {
};
#else
void TT_Exception (char *);
#if defined(linux) || defined(CSRG_BASED) || defined(sun)
#if defined(__linux__) || defined(CSRG_BASED) || defined(sun)
friend std::ostream & operator<< (std::ostream &, TTFile &);
#else
friend ostream & operator<< (ostream &, TTFile &);

6
cde/programs/dtsearchpath/libCliSrv/UnixEnv.C
View File

@@ -34,7 +34,7 @@
#include <sys/stat.h>
#include <stdlib.h>
#include <string.h>
#if defined(linux) || defined(CSRG_BASED) || defined(sun)
#if defined(__linux__) || defined(CSRG_BASED) || defined(sun)
#include <iostream>
#else
#include <iostream.h>
@@ -50,7 +50,7 @@
#endif
#include <errno.h>
#if defined(sun) || defined(_AIX) || defined(linux) || defined(CSRG_BASED)
#if defined(sun) || defined(_AIX) || defined(__linux__) || defined(CSRG_BASED)
#define UID_NO_CHANGE ((uid_t) -1)
#define GID_NO_CHANGE ((gid_t) -1)
#endif
@@ -73,7 +73,7 @@ UnixEnvironment::UnixEnvironment()
manpath = "/usr/share/man:/usr/lpp/info";
#elif defined(hpux)
manpath = "/usr/man:/usr/contrib/man:/usr/local/man";
#elif defined(linux)
#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";

2
cde/programs/dtsearchpath/libCliSrv/cstring.C
View File

@@ -566,7 +566,7 @@ int i;
}
}
#if defined(linux) || defined(CSRG_BASED) || defined(sun)
#if defined(__linux__) || defined(CSRG_BASED) || defined(sun)
std::ostream & operator<<
(
std::ostream & os,

4
cde/programs/dtsearchpath/libCliSrv/cstring.h
View File

@@ -32,7 +32,7 @@
#ifndef _CSTRING_H_
#define _CSTRING_H_
#if defined(linux) || defined(CSRG_BASED) || defined(sun)
#if defined(__linux__) || defined(CSRG_BASED) || defined(sun)
#include <iostream>
#else
#include <iostream.h>
@@ -72,7 +72,7 @@ class CString {
int isNull() const;
void replace (const CString &, const CString &);
#if defined(linux) || defined(CSRG_BASED) || defined(sun)
#if defined(__linux__) || defined(CSRG_BASED) || defined(sun)
friend std::ostream & operator<< (std::ostream &, const CString &);
#else
friend ostream & operator<< (ostream &, const CString &);