external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-03-09 15:50:02 +00:00
Code Issues Releases Wiki Activity

OpenBSD patches for dtcalc, dtdocbook, dthelp and dtimsstart.

Browse source
This commit is contained in:
Pascal Stumpf 2012-08-11 13:38:22 +02:00 • committed by Jon Trulson
parent b17e52a269
commit 3e4517dc2a
11 changed files with 30 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

7
cde/programs/dtcalc/motif.c
View file

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

2
cde/programs/dtdocbook/instant/util.c
View file

@ -78,7 +78,9 @@ static char *RCSid =
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/file.h> #include <sys/file.h>
#if !defined(CSRG_BASED)
#include <values.h> #include <values.h>
#endif
#include "general.h" #include "general.h"

6
cde/programs/dthelp/parser/canon1/helptag/global.h
View file

@ -44,7 +44,7 @@
#endif #endif
#include <ctype.h> #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 <unistd.h>
#include <locale.h> #include <locale.h>
#include <fcntl.h> #include <fcntl.h>
@ -179,7 +179,7 @@ EXTERN char dirsep
#if defined(MSDOS) #if defined(MSDOS)
INIT('\\') INIT('\\')
#else #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('/') INIT('/')
#else #else
****define directory separator here**** ****define directory separator here****
@ -187,7 +187,7 @@ INIT('/')
#endif #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 CSEP '/'
#define SSEP "/" #define SSEP "/"
#else #else

6
cde/programs/dthelp/parser/canon1/helptag/help.c
View file

@ -356,7 +356,7 @@ char *qualname;
char *unqualname; char *unqualname;
#endif #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; FILE *f;
#endif #endif
@ -381,7 +381,7 @@ else
fnp = fn; 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'; qualname[0] = '\0';
gp = qualname + strlen(qualname); gp = qualname + strlen(qualname);
roomleft = roomleft - strlen(qualname); roomleft = roomleft - strlen(qualname);
@ -495,7 +495,7 @@ do {
while (1); while (1);
*strrchr(qualname, CSEP) = '\0'; *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 #else
strupr ( qualname ); strupr ( qualname );
#endif #endif

2
cde/programs/dthelp/parser/canon1/util/wchar.c
View file

@ -26,6 +26,8 @@
*/ */
#include "basic.h" #include "basic.h"
#include "trie.h"
#include "cont.h"
/* compare two wide character strings */ /* compare two wide character strings */

6
cde/programs/dthelp/parser/pass1/helptag/help.c
View file

@ -355,7 +355,7 @@ char *qualname;
char *unqualname; char *unqualname;
#endif #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; FILE *f;
#endif #endif
char fn[FNAMELEN]; char fn[FNAMELEN];
@ -379,7 +379,7 @@ else
fnp = fn; 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'; qualname[0] = '\0';
gp = qualname + strlen(qualname); gp = qualname + strlen(qualname);
roomleft = roomleft - strlen(qualname); roomleft = roomleft - strlen(qualname);
@ -493,7 +493,7 @@ do {
while (1); while (1);
*strrchr(qualname, CSEP) = '\0'; *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 #else
strupr ( qualname ); strupr ( qualname );
#endif #endif

2
cde/programs/dthelp/parser/pass1/util/wchar.c
View file

@ -26,6 +26,8 @@
*/ */
#include "basic.h" #include "basic.h"
#include "trie.h"
#include "cont.h"
/* compare two wide character strings */ /* compare two wide character strings */

2
cde/programs/dthelp/parser/pass2/htag2/global.h
View file

@ -44,7 +44,7 @@
#endif #endif
#include <ctype.h> #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 <unistd.h>
#include <locale.h> #include <locale.h>
#include <fcntl.h> #include <fcntl.h>

2
cde/programs/dthelp/parser/pass2/util/wchar.c
View file

@ -26,6 +26,8 @@
*/ */
#include "basic.h" #include "basic.h"
#include "trie.h"
#include "cont.h"
/* compare two wide character strings */ /* compare two wide character strings */

2
cde/programs/dtimsstart/main.c
View file

@ -136,7 +136,7 @@ main (argc, argv)
case MODE_START: case MODE_START:
#ifndef DEBUG2 #ifndef DEBUG2
# ifdef __osf__ # if defined(__osf__) || defined(CSRG_BASED)
setsid(); setsid();
# else # else
setpgrp(); setpgrp();

8
cde/programs/dtimsstart/start.c
View file

@ -28,7 +28,7 @@
#include <setjmp.h> #include <setjmp.h>
#include <unistd.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 #define _NFILE FOPEN_MAX
#endif #endif
@ -233,7 +233,7 @@ void set_sig_chld(enable)
int enable; int enable;
{ {
DPR(("set_sig_chld(%s)\n", enable ? "Enabled" : "Disabled")); 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) int im_mod_available(renv)
@ -620,7 +620,7 @@ static int invoke_ims(sel)
for (i = 0; i < _NFILE; i++) for (i = 0; i < _NFILE; i++)
(void) close(i); (void) close(i);
#ifdef __osf__ #if defined(__osf__) || defined(CSRG_BASED)
setsid(); setsid();
#else #else
setpgrp(); setpgrp();
@ -668,7 +668,7 @@ static void on_sig_chld(sig)
if (pid == -1) if (pid == -1)
return; return;
signal(SIGCLD, on_sig_chld); signal(SIGCHLD, on_sig_chld);
if (WIFEXITED(wait_status)) { if (WIFEXITED(wait_status)) {
cause = ErrImsAborted; cause = ErrImsAborted;