From 1fdcd4c93d2edf000fc8e6278991774ec9e396e7 Mon Sep 17 00:00:00 2001 From: Swift Griggs Date: Fri, 5 Aug 2016 10:47:57 -0600 Subject: [PATCH] Patches from pkgsrc-WIP --- cde/lib/DtHelp/HelpXlate.c | 1 + cde/programs/dtlogin/dm.c | 3 +-- cde/programs/dtlogin/dm.h | 2 +- cde/programs/dtmail/libDtMail/Common/Session.C | 2 +- cde/programs/dtmail/libDtMail/RFC/RFCBodyPart.C | 2 +- cde/programs/dtpdmd/manager.c | 4 ++-- cde/programs/dtprintinfo/libUI/MotifUI/Debug.c | 2 +- cde/programs/dtprintinfo/objects/PrintObj/ParseJobs.C | 2 +- cde/programs/dtsearchpath/libCliSrv/UnixEnv.C | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/cde/lib/DtHelp/HelpXlate.c b/cde/lib/DtHelp/HelpXlate.c index bc83e4cd..acc83fe5 100644 --- a/cde/lib/DtHelp/HelpXlate.c +++ b/cde/lib/DtHelp/HelpXlate.c @@ -39,6 +39,7 @@ $END$ #include #include #include /* MAXPATHLEN */ +#include /* for Xrm */ #include diff --git a/cde/programs/dtlogin/dm.c b/cde/programs/dtlogin/dm.c index b484974c..6c415c2a 100644 --- a/cde/programs/dtlogin/dm.c +++ b/cde/programs/dtlogin/dm.c @@ -62,8 +62,7 @@ # include # include # include -#if defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__) || \ - defined(sun) +#if defined(linux) || defined(CSRG_BASED) || defined(sun) # include #else # include diff --git a/cde/programs/dtlogin/dm.h b/cde/programs/dtlogin/dm.h index fa3bc23f..1d35f008 100644 --- a/cde/programs/dtlogin/dm.h +++ b/cde/programs/dtlogin/dm.h @@ -202,7 +202,7 @@ ***************************************************************************/ /*#if defined(SYSV) && !defined(hpux)*/ -#if defined(SYSV) || defined(SVR4) || defined(linux) || defined(__FreeBSD__) || defined(OpenBSD) +#if defined(SYSV) || defined(SVR4) || defined(linux) || defined(CSRG_BASED) # include # define waitCode(w) WEXITSTATUS(w) # define waitSig(w) WTERMSIG(w) diff --git a/cde/programs/dtmail/libDtMail/Common/Session.C b/cde/programs/dtmail/libDtMail/Common/Session.C index d42c553c..830a9972 100644 --- a/cde/programs/dtmail/libDtMail/Common/Session.C +++ b/cde/programs/dtmail/libDtMail/Common/Session.C @@ -1618,7 +1618,7 @@ char *from_cs, char *to_cs) DtMailEnv error; iconv_t cd; size_t ileft = (size_t) bp_len, oleft = (size_t) bp_len, ret = 0; -#if defined(_AIX) || defined(sun) || defined(__FreeBSD__) || defined(__NetBSD__) +#if defined(_AIX) || defined(sun) || defined(CSRG_BASED) const char *ip = (const char *) *bp; #else char *ip = *bp; diff --git a/cde/programs/dtmail/libDtMail/RFC/RFCBodyPart.C b/cde/programs/dtmail/libDtMail/RFC/RFCBodyPart.C index 0f0630fb..172b844e 100644 --- a/cde/programs/dtmail/libDtMail/RFC/RFCBodyPart.C +++ b/cde/programs/dtmail/libDtMail/RFC/RFCBodyPart.C @@ -1030,7 +1030,7 @@ char *from_cs, char *to_cs) DtMailEnv error; iconv_t cd; size_t ileft = (size_t) bp_len, oleft = (size_t) bp_len, ret = 0; -#if defined(_aix) || defined(sun) || defined(__FreeBSD__) || defined(__NetBSD__) +#if defined(_aix) || defined(sun) || defined(CSRG_BASED) const char *ip = (const char *) *bp; #else char *ip = *bp; diff --git a/cde/programs/dtpdmd/manager.c b/cde/programs/dtpdmd/manager.c index ae0fbd9e..b0f05864 100644 --- a/cde/programs/dtpdmd/manager.c +++ b/cde/programs/dtpdmd/manager.c @@ -648,7 +648,7 @@ void mgr_launch_reply( XpPdmServiceRec *rec ) XEvent reply; Status status; FILE *errlog; - long now; + time_t now; char *eec; Atom tmpa; @@ -897,7 +897,7 @@ Bool has_exec_token( XpPdmServiceRec *rec ) void mgr_shutdown_scan() { int i; - long now; + time_t now; FILE *errlog; static int errlog_problem_notice = 0; Bool shutdown_time; diff --git a/cde/programs/dtprintinfo/libUI/MotifUI/Debug.c b/cde/programs/dtprintinfo/libUI/MotifUI/Debug.c index 87f6ac37..5f1507ae 100644 --- a/cde/programs/dtprintinfo/libUI/MotifUI/Debug.c +++ b/cde/programs/dtprintinfo/libUI/MotifUI/Debug.c @@ -105,7 +105,7 @@ SysErrorMsg( int n ) { -#if !defined(linux) && !defined(__FreeBSD__) && !defined(__NetBSD__) +#if !defined(linux) && !defined(CSRG_BASED) extern char *sys_errlist[]; extern int sys_nerr; #endif diff --git a/cde/programs/dtprintinfo/objects/PrintObj/ParseJobs.C b/cde/programs/dtprintinfo/objects/PrintObj/ParseJobs.C index eca6258a..aba63ef8 100644 --- a/cde/programs/dtprintinfo/objects/PrintObj/ParseJobs.C +++ b/cde/programs/dtprintinfo/objects/PrintObj/ParseJobs.C @@ -870,7 +870,7 @@ void LocalPrintJobs(char *printer, char **return_job_list, int *return_n_jobs) #if defined(__osf__) sprintf(buf, "LANG=C lpstat -o%s", printer); #endif -#if defined(linux) || defined(__OpenBSD__) +#if defined(linux) || defined(__OpenBSD__) || defined(__NetBSD__) snprintf(buf, 1000, "LANG=C lpq -P%s", printer); #elif defined(__FreeBSD__) snprintf(buf, 1000, "LANG=C /usr/local/bin/lpq -P%s", printer); diff --git a/cde/programs/dtsearchpath/libCliSrv/UnixEnv.C b/cde/programs/dtsearchpath/libCliSrv/UnixEnv.C index add17bfe..2ede9fe1 100644 --- a/cde/programs/dtsearchpath/libCliSrv/UnixEnv.C +++ b/cde/programs/dtsearchpath/libCliSrv/UnixEnv.C @@ -85,7 +85,7 @@ UnixEnvironment::UnixEnvironment() #elif defined(__FreeBSD__) manpath = "/usr/share/man:/usr/local/man"; #elif defined(__NetBSD__) - manpath = "/usr/share/man:/usr/X11R6/man:/usr/X11R7/man"; + manpath = "/usr/share/man:/usr/X11R6/man:/usr/X11R7/man:/usr/local/man:/usr/pkg/man"; #endif else manpath = temp; -- 2.25.1