X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=cde%2Fprograms%2Fdtsearchpath%2Fdtsp%2FSearchPath.C;h=55334856dedac954867c2b4c58769f992614827a;hb=419a7efff4541e7327bc1c4e28c4d8f16fb81035;hp=5e9d3f83596a2bcf26fbfbe10afd5a55f228b3b8;hpb=e2432556b8d2ec0a9ff9a4a3fb0ee92a89626188;p=oweals%2Fcde.git diff --git a/cde/programs/dtsearchpath/dtsp/SearchPath.C b/cde/programs/dtsearchpath/dtsp/SearchPath.C index 5e9d3f83..55334856 100644 --- a/cde/programs/dtsearchpath/dtsp/SearchPath.C +++ b/cde/programs/dtsearchpath/dtsp/SearchPath.C @@ -16,7 +16,7 @@ * details. * * You should have received a copy of the GNU Lesser General Public - * License along with these librararies and programs; if not, write + * License along with these libraries and programs; if not, write * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth * Floor, Boston, MA 02110-1301 USA */ @@ -387,7 +387,7 @@ void SearchPath::Print() * ****************************************************************/ -#if defined(linux) +#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) +#if defined(__linux__) || defined(CSRG_BASED) || defined(sun) os << " " << subpath << std::endl; #else os << " " << subpath << endl; #endif subpath = path.next(); } -#if defined(linux) +#if defined(__linux__) || defined(CSRG_BASED) || defined(sun) os << std::endl; #else os << endl; @@ -424,7 +424,7 @@ void SearchPath::PrettyPrint * ****************************************************************/ -#if defined(linux) +#if defined(__linux__) || defined(CSRG_BASED) || defined(sun) std::ostream & operator<< ( std::ostream & os, @@ -438,7 +438,7 @@ ostream & operator<< ) #endif { -#if defined(linux) +#if defined(__linux__) || defined(CSRG_BASED) || defined(sun) os << sp.GetEnvVar() << "SEARCHPATH:" << std::endl; #else os << sp.GetEnvVar() << "SEARCHPATH:" << endl;