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

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 &);