OpenBSD patches for dtcalc, dtdocbook, dthelp and dtimsstart.

diff --git a/cde/programs/dtcalc/motif.c b/cde/programs/dtcalc/motif.c
index 2a663e4d71b24493022a6532597f9624e5f66113..e3db030d77905d85fd91a70bd82e2d8148a08c6b 100644 (file)
--- a/cde/programs/dtcalc/motif.c
+++ b/cde/programs/dtcalc/motif.c
@@ -80,6 +80,7 @@
 #include <Xm/MwmUtil.h>
 #include <Xm/Protocols.h>
 #include <Xm/VendorSEP.h>
+#include <Xm/SeparatoG.h>
 /* Copied from BaseClassI.h */
 extern XmWidgetExtData _XmGetWidgetExtData(
                         Widget widget,
@@ -266,6 +267,12 @@ extern Vars v ;                 /* Calctool variables and options. */
 char translations_return[] = "<Key>Return:ManagerGadgetSelect()";
 static Boolean NoDisplay=False;
 
+extern XtPointer _XmStringUngenerate (
+                                XmString string,
+                                XmStringTag tag,
+                                XmTextType tag_type,
+                                XmTextType output_type);
+
 int
 main(argc, argv)
 int argc ;

diff --git a/cde/programs/dtdocbook/instant/util.c b/cde/programs/dtdocbook/instant/util.c
index 19ab9bdda3706bc8870987a097344aa930a69875..eb3d26472ab53da6d21c5354d7b7df2c0b66cc5d 100644 (file)
--- a/cde/programs/dtdocbook/instant/util.c
+++ b/cde/programs/dtdocbook/instant/util.c
@@ -78,7 +78,9 @@ static char *RCSid =
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/file.h>
+#if !defined(CSRG_BASED)
 #include <values.h>
+#endif
 
 #include "general.h"
 

diff --git a/cde/programs/dthelp/parser/canon1/helptag/global.h b/cde/programs/dthelp/parser/canon1/helptag/global.h
index 7b619d119e039e7b33b1f1e7860dd5578a4151b1..2e9e26749f00ba770e4360dfcb672bcda3748e6c 100644 (file)
--- a/cde/programs/dthelp/parser/canon1/helptag/global.h
+++ b/cde/programs/dthelp/parser/canon1/helptag/global.h
@@ -44,7 +44,7 @@
 #endif
 #include <ctype.h>
 
-#if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) || defined(__uxp__) || defined(__osf__) || defined(linux)
+#if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) || defined(__uxp__) || defined(__osf__) || defined(linux) || defined(CSRG_BASED)
 #include <unistd.h>
 #include <locale.h>
 #include <fcntl.h>
@@ -179,7 +179,7 @@ EXTERN char dirsep
 #if defined(MSDOS)
 INIT('\\')
 #else
-#if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) || defined(__uxp__) || defined(__osf__) || defined(linux)
+#if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) || defined(__uxp__) || defined(__osf__) || defined(linux) || defined(CSRG_BASED)
 INIT('/')
 #else
 ****define directory separator here****
@@ -187,7 +187,7 @@ INIT('/')
 #endif
   ;
 
-#if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) || defined(__uxp__)|| defined(__osf__) || defined(linux)
+#if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) || defined(__uxp__)|| defined(__osf__) || defined(linux) || defined(CSRG_BASED)
 #define CSEP '/'
 #define SSEP "/"
 #else

diff --git a/cde/programs/dthelp/parser/canon1/helptag/help.c b/cde/programs/dthelp/parser/canon1/helptag/help.c
index 830bf2ec65592173858c35ae00c7268161449fd2..2162595389fc629fabef04b21fb3b9dfc25c20e2 100644 (file)
--- a/cde/programs/dthelp/parser/canon1/helptag/help.c
+++ b/cde/programs/dthelp/parser/canon1/helptag/help.c
@@ -356,7 +356,7 @@ char *qualname;
 char *unqualname;
 #endif
 {
-#if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) || defined(__uxp__) || defined(__osf__) || defined(linux)
+#if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) || defined(__uxp__) || defined(__osf__) || defined(linux) || defined(CSRG_BASED)
 
 FILE *f;
 #endif
@@ -381,7 +381,7 @@ else
 
 fnp = fn;
 
-#if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) || defined(__uxp__) || defined(__osf__) || defined(linux)
+#if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) || defined(__uxp__) || defined(__osf__) || defined(linux) || defined(CSRG_BASED)
 qualname[0] = '\0';
 gp = qualname + strlen(qualname);
 roomleft = roomleft - strlen(qualname);
@@ -495,7 +495,7 @@ do  {
 while (1);
 *strrchr(qualname, CSEP) = '\0';
 
-#if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) || defined(__uxp__) || defined(__osf__) || defined(linux)
+#if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) || defined(__uxp__) || defined(__osf__) || defined(linux) || defined(CSRG_BASED)
 #else
 strupr ( qualname );
 #endif

diff --git a/cde/programs/dthelp/parser/canon1/util/wchar.c b/cde/programs/dthelp/parser/canon1/util/wchar.c
index 570aaa874b7436c45557203be136a5c0c455559b..d49e825f867245ba6a0ad438631bb9705a8cef18 100644 (file)
--- a/cde/programs/dthelp/parser/canon1/util/wchar.c
+++ b/cde/programs/dthelp/parser/canon1/util/wchar.c
@@ -26,6 +26,8 @@
 */
 
 #include "basic.h"
+#include "trie.h"
+#include "cont.h"
 
 
 /* compare two wide character strings */

diff --git a/cde/programs/dthelp/parser/pass1/helptag/help.c b/cde/programs/dthelp/parser/pass1/helptag/help.c
index 7e291cc2d2b09d430873d86103ef5a6669c48506..115e5486896c48a1cd39c25066dd0b55addf4289 100644 (file)
--- a/cde/programs/dthelp/parser/pass1/helptag/help.c
+++ b/cde/programs/dthelp/parser/pass1/helptag/help.c
@@ -355,7 +355,7 @@ char *qualname;
 char *unqualname;
 #endif
 {
-#if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) || defined(__uxp__) || defined(__osf__) || defined(linux)
+#if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) || defined(__uxp__) || defined(__osf__) || defined(linux) || defined(CSRG_BASED)
 FILE *f;
 #endif
 char fn[FNAMELEN];
@@ -379,7 +379,7 @@ else
 
 fnp = fn;
 
-#if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) || defined(__uxp__) || defined(__osf__) || defined(linux)
+#if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) || defined(__uxp__) || defined(__osf__) || defined(linux) || defined(CSRG_BASED)
 qualname[0] = '\0';
 gp = qualname + strlen(qualname);
 roomleft = roomleft - strlen(qualname);
@@ -493,7 +493,7 @@ do  {
 while (1);
 *strrchr(qualname, CSEP) = '\0';
 
-#if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) || defined(__uxp__) || defined(__osf__) || defined(linux)
+#if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) || defined(__uxp__) || defined(__osf__) || defined(linux) || defined(CSRG_BASED)
 #else
 strupr ( qualname );
 #endif

diff --git a/cde/programs/dthelp/parser/pass1/util/wchar.c b/cde/programs/dthelp/parser/pass1/util/wchar.c
index 44d388a4a2332213e7ec8c461223e9e5d664c221..0d8b46ce76ac523f8814da9d12bf74c5e092e818 100644 (file)
--- a/cde/programs/dthelp/parser/pass1/util/wchar.c
+++ b/cde/programs/dthelp/parser/pass1/util/wchar.c
@@ -26,6 +26,8 @@
 */
 
 #include "basic.h"
+#include "trie.h"
+#include "cont.h"
 
 
 /* compare two wide character strings */

diff --git a/cde/programs/dthelp/parser/pass2/htag2/global.h b/cde/programs/dthelp/parser/pass2/htag2/global.h
index e14bcdef9c580f44b4609e63452425fbb371722e..5ff444a3d175927ce276615df0eb8af48160e490 100644 (file)
--- a/cde/programs/dthelp/parser/pass2/htag2/global.h
+++ b/cde/programs/dthelp/parser/pass2/htag2/global.h
@@ -44,7 +44,7 @@
 #endif
 #include <ctype.h>
 
-#if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) || defined(__uxp__) || defined(linux)
+#if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) || defined(__uxp__) || defined(linux) || defined(CSRG_BASED)
 #include <unistd.h>
 #include <locale.h>
 #include <fcntl.h>

diff --git a/cde/programs/dthelp/parser/pass2/util/wchar.c b/cde/programs/dthelp/parser/pass2/util/wchar.c
index c2bab001c58ebb6e6c7856894f22a9c96dd027e5..780bbf40eb95a890422c987cc22ab91f8572bdda 100644 (file)
--- a/cde/programs/dthelp/parser/pass2/util/wchar.c
+++ b/cde/programs/dthelp/parser/pass2/util/wchar.c
@@ -26,6 +26,8 @@
 */
 
 #include "basic.h"
+#include "trie.h"
+#include "cont.h"
 
 
 /* compare two wide character strings */

diff --git a/cde/programs/dtimsstart/main.c b/cde/programs/dtimsstart/main.c
index 735f8bb48d333fc0f3dee8ad0e2470920fa460b4..ef445113fcfaa9841552d229a9426278a815415c 100644 (file)
--- a/cde/programs/dtimsstart/main.c
+++ b/cde/programs/dtimsstart/main.c
@@ -136,7 +136,7 @@ main (argc, argv)
 
        case MODE_START:
 #ifndef        DEBUG2
-# ifdef __osf__
+# if defined(__osf__) || defined(CSRG_BASED)
                                setsid();
 # else
                                setpgrp();

diff --git a/cde/programs/dtimsstart/start.c b/cde/programs/dtimsstart/start.c
index be6a0b7f55068270ca2d2f83df284be6e1add2c5..68800512f9e22afbd4546552fdcfa06a007be817 100644 (file)
--- a/cde/programs/dtimsstart/start.c
+++ b/cde/programs/dtimsstart/start.c
@@ -28,7 +28,7 @@
 #include       <setjmp.h>
 #include       <unistd.h>
 
-#if (defined(USL) || defined(__uxp__) | defined(linux)) && !defined(_NFILE)
+#if (defined(USL) || defined(__uxp__) || defined(linux) || defined(CSRG_BASED)) && !defined(_NFILE)
 #define _NFILE FOPEN_MAX
 #endif
 
@@ -233,7 +233,7 @@ void        set_sig_chld(enable)
     int                enable;
 {
     DPR(("set_sig_chld(%s)\n", enable ? "Enabled" : "Disabled"));
-    signal(SIGCLD, enable ? on_sig_chld : SIG_IGN);
+    signal(SIGCHLD, enable ? on_sig_chld : SIG_IGN);
 }
 
 int    im_mod_available(renv)
@@ -620,7 +620,7 @@ static int  invoke_ims(sel)
        for (i = 0; i < _NFILE; i++)
            (void) close(i);
 
-#ifdef __osf__
+#if defined(__osf__) || defined(CSRG_BASED)
        setsid();
 #else
        setpgrp();
@@ -668,7 +668,7 @@ static void on_sig_chld(sig)
     if (pid == -1)
        return;
 
-    signal(SIGCLD, on_sig_chld);
+    signal(SIGCHLD, on_sig_chld);
 
     if (WIFEXITED(wait_status)) {
        cause = ErrImsAborted;