From: Peter Howkins <flibble@users.sourceforge.net>
Date: Thu, 12 Apr 2012 15:21:14 +0000 (+0100)
Subject: Linux compilation fixes for dthelp (Matthew Howkins)
X-Git-Tag: 2.2.0a~26^2~47
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1d97f1916693b66af3bae85b8f1f56bfb47ec042;p=oweals%2Fcde.git

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 9fe9d91a..743385d8 100644
--- 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 c4207f32..b7e7eb69 100644
--- 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 a06395e2..f7ac25a9 100644
--- 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 aa8dfbd0..06e4ce7b 100644
--- 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 8883b784..f907fa1e 100644
--- 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 9691fc4d..4cdccbb8 100644
--- 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 bfbd1437..e47dd77b 100644
--- 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] ;