Linux compilation fixes for dthelp (Matthew Howkins)

diff --git a/cde/programs/dthelp/parser/canon1/parser/parser.c b/cde/programs/dthelp/parser/canon1/parser/parser.c
index 9fe9d91a028f78f57f21fcdf60b57efacdbbe8c1..743385d8d06d2e1362e038aa318d09bdcdb38c13 100644 (file)
--- a/cde/programs/dthelp/parser/canon1/parser/parser.c
+++ b/cde/programs/dthelp/parser/canon1/parser/parser.c
@@ -44,6 +44,11 @@ void main(argc, argv)
 {
 M_WCHAR *wc_userdef;
 
+#if defined(linux)
+m_outfile = stdout;
+m_errfile = stderr;
+#endif
+
 m_argc = argc ;
 m_argv = argv ;
 

diff --git a/cde/programs/dthelp/parser/canon1/parser/parser.h b/cde/programs/dthelp/parser/canon1/parser/parser.h
index c4207f323e809e86f6d464c09d32f90a1ab4e966..b7e7eb69624a671519901af9ed83b9ea0d687264 100644 (file)
--- a/cde/programs/dthelp/parser/canon1/parser/parser.h
+++ b/cde/programs/dthelp/parser/canon1/parser/parser.h
@@ -439,8 +439,13 @@ M_PAREXTERN int m_argc ;
 M_PAREXTERN char **m_argv ;
 
 /* PARSER output file */
+#if defined(linux)
+M_PAREXTERN FILE *m_outfile;
+M_PAREXTERN FILE *m_errfile;
+#else
 M_PAREXTERN FILE *m_outfile M_PARINIT(stdout) ;
 M_PAREXTERN FILE *m_errfile M_PARINIT(stdout) ;
+#endif
 
 /* Save processing instruction */
 M_PAREXTERN M_WCHAR m_pi[M_PILEN + 1] ;

diff --git a/cde/programs/dthelp/parser/pass1/parser/parser.c b/cde/programs/dthelp/parser/pass1/parser/parser.c
index a06395e22858f19d46302583c190ce1be7747a6b..f7ac25a9d7692d69b8bf3e6ad7e13cf8b270213e 100644 (file)
--- a/cde/programs/dthelp/parser/pass1/parser/parser.c
+++ b/cde/programs/dthelp/parser/pass1/parser/parser.c
@@ -55,6 +55,11 @@ void main(argc, argv)
                      sizeof(literal) + M_LITLEN - 2)] ;
 #endif
 
+#if defined(linux)
+    m_outfile = stdout;
+    m_errfile = stderr;
+#endif
+
     m_argc = argc ;
     m_argv = argv ;
 

diff --git a/cde/programs/dthelp/parser/pass1/parser/parser.h b/cde/programs/dthelp/parser/pass1/parser/parser.h
index aa8dfbd0a8e254b25b35fd15ba0fb24c1752b102..06e4ce7b23c6b434d97155f15d2a42337ac0be33 100644 (file)
--- a/cde/programs/dthelp/parser/pass1/parser/parser.h
+++ b/cde/programs/dthelp/parser/pass1/parser/parser.h
@@ -437,8 +437,13 @@ M_PAREXTERN int m_argc ;
 M_PAREXTERN char **m_argv ;
 
 /* PARSER output file */
+#if defined(linux)
+M_PAREXTERN FILE *m_outfile;
+M_PAREXTERN FILE *m_errfile;
+#else
 M_PAREXTERN FILE *m_outfile M_PARINIT(stdout) ;
 M_PAREXTERN FILE *m_errfile M_PARINIT(stdout) ;
+#endif
 
 /* Save processing instruction */
 M_PAREXTERN M_WCHAR m_pi[M_PILEN + 1] ;

diff --git a/cde/programs/dthelp/parser/pass2/htag2/sdl.c b/cde/programs/dthelp/parser/pass2/htag2/sdl.c
index 8883b7844d354632c2521ae7078f7acbcb419edd..f907fa1ea3b1661a01875a9e01219786cc2ba8a0 100644 (file)
--- a/cde/programs/dthelp/parser/pass2/htag2/sdl.c
+++ b/cde/programs/dthelp/parser/pass2/htag2/sdl.c
@@ -35,6 +35,10 @@
 #endif /* __osf__ */
 #include <errno.h>
 
+#if defined(linux)
+#include <getopt.h>
+#endif
+
 #include "userinc.h"
 #include "globdec.h"
 

diff --git a/cde/programs/dthelp/parser/pass2/parser/parser.c b/cde/programs/dthelp/parser/pass2/parser/parser.c
index 9691fc4d4800ae1b20d78c3d9b855c4e63723f88..4cdccbb80adac36098af67324aceec6faef149b1 100644 (file)
--- a/cde/programs/dthelp/parser/pass2/parser/parser.c
+++ b/cde/programs/dthelp/parser/pass2/parser/parser.c
@@ -55,6 +55,11 @@ void main(argc, argv)
                      sizeof(literal) + M_LITLEN - 2)] ;
 #endif
 
+#if defined(linux)
+    m_outfile = stdout;
+    m_errfile = stderr;
+#endif
+
     m_argc = argc ;
     m_argv = argv ;
 

diff --git a/cde/programs/dthelp/parser/pass2/parser/parser.h b/cde/programs/dthelp/parser/pass2/parser/parser.h
index bfbd1437e3637bf1a36d9f46ac9eb0af0bb7f19a..e47dd77b1d6864cb4934e72c957c6c203d80f43b 100644 (file)
--- a/cde/programs/dthelp/parser/pass2/parser/parser.h
+++ b/cde/programs/dthelp/parser/pass2/parser/parser.h
@@ -437,8 +437,13 @@ M_PAREXTERN int m_argc ;
 M_PAREXTERN char **m_argv ;
 
 /* PARSER output file */
+#if defined(linux)
+M_PAREXTERN FILE *m_outfile;
+M_PAREXTERN FILE *m_errfile;
+#else
 M_PAREXTERN FILE *m_outfile M_PARINIT(stdout) ;
 M_PAREXTERN FILE *m_errfile M_PARINIT(stderr) ;
+#endif
 
 /* Save processing instruction */
 M_PAREXTERN M_WCHAR m_pi[M_PILEN + 1] ;