X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=cde%2Fprograms%2Fnsgmls%2Fnsgmls.C;h=25c038bddc0c30466ff36b6899acf6e4c73cf04f;hb=1c822c2f0b02925cf20c5c7e0d601a944356e859;hp=c1ec860850751d8a56d9e6d819c31dae167e4dbf;hpb=d6c57bf33044a6e0e2fe9ba1538222d0075bdd31;p=oweals%2Fcde.git

diff --git a/cde/programs/nsgmls/nsgmls.C b/cde/programs/nsgmls/nsgmls.C
index c1ec8608..25c038bd 100644
--- a/cde/programs/nsgmls/nsgmls.C
+++ b/cde/programs/nsgmls/nsgmls.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
  */
@@ -38,7 +38,7 @@
 #include "sptchar.h"
 #include "macros.h"
 
-#if defined(linux)
+#if defined(__linux__) || defined(CSRG_BASED) || defined(sun)
 #include <iostream>
 #include <fstream>
 #else
@@ -84,7 +84,7 @@ public:
 		    const AppChar *filename,
 		    const StringC &filenameStr,
 		    const OutputCodingSystem *,
-#if defined(linux)
+#if defined(__linux__) || defined(CSRG_BASED) || defined(sun)
 		    ::Messenger *messenger);
 #else
 		    Messenger *messenger);
@@ -94,7 +94,7 @@ public:
   void truncateOutput();
   void allLinkTypesActivated();
 private:
-#if defined(linux)
+#if defined(__linux__) || defined(CSRG_BASED) || defined(sun)
   ::Messenger *messenger_;
 #else
   Messenger *messenger_;
@@ -248,7 +248,7 @@ XRastEventHandler::XRastEventHandler(SgmlParser *parser,
 				     const AppChar *filename,
 				     const StringC &filenameStr,
 				     const OutputCodingSystem *codingSystem,
-#if defined(linux)
+#if defined(__linux__) || defined(CSRG_BASED) || defined(sun)
 				     ::Messenger *messenger)
 #else
 				     ::Messenger *messenger)