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

diff --git a/cde/programs/nsgmls/nsgmls.C b/cde/programs/nsgmls/nsgmls.C
index 122e9d86..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,8 +38,13 @@
 #include "sptchar.h"
 #include "macros.h"
 
+#if defined(__linux__) || defined(CSRG_BASED) || defined(sun)
+#include <iostream>
+#include <fstream>
+#else
 #include <iostream.h>
 #include <fstream.h>
+#endif
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
@@ -79,13 +84,21 @@ public:
 		    const AppChar *filename,
 		    const StringC &filenameStr,
 		    const OutputCodingSystem *,
+#if defined(__linux__) || defined(CSRG_BASED) || defined(sun)
+		    ::Messenger *messenger);
+#else
 		    Messenger *messenger);
+#endif
   ~XRastEventHandler();
   void message(MessageEvent *);
   void truncateOutput();
   void allLinkTypesActivated();
 private:
+#if defined(__linux__) || defined(CSRG_BASED) || defined(sun)
+  ::Messenger *messenger_;
+#else
   Messenger *messenger_;
+#endif
   // file_ must come before os_ so it gets inited first
   filebuf file_;
   IosOutputCharStream os_;
@@ -235,7 +248,11 @@ XRastEventHandler::XRastEventHandler(SgmlParser *parser,
 				     const AppChar *filename,
 				     const StringC &filenameStr,
 				     const OutputCodingSystem *codingSystem,
-				     Messenger *messenger)
+#if defined(__linux__) || defined(CSRG_BASED) || defined(sun)
+				     ::Messenger *messenger)
+#else
+				     ::Messenger *messenger)
+#endif
 : RastEventHandler(parser, messenger),
   messenger_(messenger),
   filename_(filename),