OpenIndiana and Solaris port
This commit is contained in:
committed by
Jon Trulson
parent
42e891d9e7
commit
01d6c363fa
@@ -1,7 +1,7 @@
|
||||
XCOMM $TOG: Imakefile /main/15 1998/08/05 13:21:49 mgreess $
|
||||
|
||||
#define CplusplusSource YES
|
||||
DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
|
||||
DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
|
||||
EXTRA_LOAD_FLAGS = ExtraLoadFlags $(UNSHARED_CXXLIB)
|
||||
|
||||
INCLUDES = -I. -I../libCliSrv
|
||||
|
||||
@@ -136,7 +136,7 @@ void ManSearchPath::Print()
|
||||
}
|
||||
}
|
||||
|
||||
#if defined(linux) || defined(CSRG_BASED)
|
||||
#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)
|
||||
#if defined(linux) || defined(CSRG_BASED) || defined(sun)
|
||||
os << sp.GetEnvVar() << std::endl;
|
||||
#else
|
||||
os << sp.GetEnvVar() << endl;
|
||||
|
||||
@@ -33,7 +33,7 @@
|
||||
|
||||
#include "Options.h"
|
||||
#include <stdlib.h>
|
||||
#if defined(linux) || defined(CSRG_BASED)
|
||||
#if defined(linux) || defined(CSRG_BASED) || defined(sun)
|
||||
#include <iostream>
|
||||
#else
|
||||
#include <iostream.h>
|
||||
|
||||
@@ -387,7 +387,7 @@ void SearchPath::Print()
|
||||
*
|
||||
****************************************************************/
|
||||
|
||||
#if defined(linux) || defined(CSRG_BASED)
|
||||
#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)
|
||||
#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)
|
||||
#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)
|
||||
#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)
|
||||
#if defined(linux) || defined(CSRG_BASED) || defined(sun)
|
||||
os << sp.GetEnvVar() << "SEARCHPATH:" << std::endl;
|
||||
#else
|
||||
os << sp.GetEnvVar() << "SEARCHPATH:" << endl;
|
||||
|
||||
@@ -34,7 +34,7 @@
|
||||
|
||||
#include "Environ.h"
|
||||
#include "cstring.h"
|
||||
#if defined(linux) || defined(CSRG_BASED)
|
||||
#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)
|
||||
#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)
|
||||
#if defined(linux) || defined(CSRG_BASED) || defined(sun)
|
||||
friend std::ostream & operator<< (std::ostream &, const ManSearchPath &);
|
||||
#else
|
||||
friend ostream & operator<< (ostream &, const ManSearchPath &);
|
||||
|
||||
Reference in New Issue
Block a user