1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-02-15 04:32:24 +00:00

Patches from pkgsrc-WIP

This commit is contained in:
Swift Griggs 2016-08-05 10:47:57 -06:00 committed by Jon Trulson
parent 341494d91c
commit 1fdcd4c93d
9 changed files with 10 additions and 10 deletions

View file

@ -39,6 +39,7 @@ $END$
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <sys/param.h> /* MAXPATHLEN */ #include <sys/param.h> /* MAXPATHLEN */
#include <time.h>
/* for Xrm */ /* for Xrm */
#include <X11/Intrinsic.h> #include <X11/Intrinsic.h>

View file

@ -62,8 +62,7 @@
# include <time.h> # include <time.h>
# include <utime.h> # include <utime.h>
# include <pwd.h> # include <pwd.h>
#if defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__) || \ #if defined(linux) || defined(CSRG_BASED) || defined(sun)
defined(sun)
# include <stdarg.h> # include <stdarg.h>
#else #else
# include <varargs.h> # include <varargs.h>

View file

@ -202,7 +202,7 @@
***************************************************************************/ ***************************************************************************/
/*#if defined(SYSV) && !defined(hpux)*/ /*#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 <sys/wait.h> # include <sys/wait.h>
# define waitCode(w) WEXITSTATUS(w) # define waitCode(w) WEXITSTATUS(w)
# define waitSig(w) WTERMSIG(w) # define waitSig(w) WTERMSIG(w)

View file

@ -1618,7 +1618,7 @@ char *from_cs, char *to_cs)
DtMailEnv error; DtMailEnv error;
iconv_t cd; iconv_t cd;
size_t ileft = (size_t) bp_len, oleft = (size_t) bp_len, ret = 0; 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; const char *ip = (const char *) *bp;
#else #else
char *ip = *bp; char *ip = *bp;

View file

@ -1030,7 +1030,7 @@ char *from_cs, char *to_cs)
DtMailEnv error; DtMailEnv error;
iconv_t cd; iconv_t cd;
size_t ileft = (size_t) bp_len, oleft = (size_t) bp_len, ret = 0; 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; const char *ip = (const char *) *bp;
#else #else
char *ip = *bp; char *ip = *bp;

View file

@ -648,7 +648,7 @@ void mgr_launch_reply( XpPdmServiceRec *rec )
XEvent reply; XEvent reply;
Status status; Status status;
FILE *errlog; FILE *errlog;
long now; time_t now;
char *eec; char *eec;
Atom tmpa; Atom tmpa;
@ -897,7 +897,7 @@ Bool has_exec_token( XpPdmServiceRec *rec )
void mgr_shutdown_scan() void mgr_shutdown_scan()
{ {
int i; int i;
long now; time_t now;
FILE *errlog; FILE *errlog;
static int errlog_problem_notice = 0; static int errlog_problem_notice = 0;
Bool shutdown_time; Bool shutdown_time;

View file

@ -105,7 +105,7 @@ SysErrorMsg(
int n int n
) )
{ {
#if !defined(linux) && !defined(__FreeBSD__) && !defined(__NetBSD__) #if !defined(linux) && !defined(CSRG_BASED)
extern char *sys_errlist[]; extern char *sys_errlist[];
extern int sys_nerr; extern int sys_nerr;
#endif #endif

View file

@ -870,7 +870,7 @@ void LocalPrintJobs(char *printer, char **return_job_list, int *return_n_jobs)
#if defined(__osf__) #if defined(__osf__)
sprintf(buf, "LANG=C lpstat -o%s", printer); sprintf(buf, "LANG=C lpstat -o%s", printer);
#endif #endif
#if defined(linux) || defined(__OpenBSD__) #if defined(linux) || defined(__OpenBSD__) || defined(__NetBSD__)
snprintf(buf, 1000, "LANG=C lpq -P%s", printer); snprintf(buf, 1000, "LANG=C lpq -P%s", printer);
#elif defined(__FreeBSD__) #elif defined(__FreeBSD__)
snprintf(buf, 1000, "LANG=C /usr/local/bin/lpq -P%s", printer); snprintf(buf, 1000, "LANG=C /usr/local/bin/lpq -P%s", printer);

View file

@ -85,7 +85,7 @@ UnixEnvironment::UnixEnvironment()
#elif defined(__FreeBSD__) #elif defined(__FreeBSD__)
manpath = "/usr/share/man:/usr/local/man"; manpath = "/usr/share/man:/usr/local/man";
#elif defined(__NetBSD__) #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 #endif
else else
manpath = temp; manpath = temp;