projects
/
oweals
/
cde.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nsgmls: remove register keyword
[oweals/cde.git]
/
cde
/
programs
/
nsgmls
/
nsgmls.C
diff --git
a/cde/programs/nsgmls/nsgmls.C
b/cde/programs/nsgmls/nsgmls.C
index 122e9d860ceb4554aedfee953bd1eb3ea5a12619..25c038bddc0c30466ff36b6899acf6e4c73cf04f 100644
(file)
--- 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
* details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with these librar
ar
ies 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
*/
* 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"
#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>
#include <iostream.h>
#include <fstream.h>
+#endif
#include <stdlib.h>
#include <string.h>
#include <errno.h>
#include <stdlib.h>
#include <string.h>
#include <errno.h>
@@
-79,13
+84,21
@@
public:
const AppChar *filename,
const StringC &filenameStr,
const OutputCodingSystem *,
const AppChar *filename,
const StringC &filenameStr,
const OutputCodingSystem *,
+#if defined(__linux__) || defined(CSRG_BASED) || defined(sun)
+ ::Messenger *messenger);
+#else
Messenger *messenger);
Messenger *messenger);
+#endif
~XRastEventHandler();
void message(MessageEvent *);
void truncateOutput();
void allLinkTypesActivated();
private:
~XRastEventHandler();
void message(MessageEvent *);
void truncateOutput();
void allLinkTypesActivated();
private:
+#if defined(__linux__) || defined(CSRG_BASED) || defined(sun)
+ ::Messenger *messenger_;
+#else
Messenger *messenger_;
Messenger *messenger_;
+#endif
// file_ must come before os_ so it gets inited first
filebuf file_;
IosOutputCharStream os_;
// 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,
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),
: RastEventHandler(parser, messenger),
messenger_(messenger),
filename_(filename),