From: Pascal Stumpf Date: Thu, 9 Aug 2012 20:51:52 +0000 (+0200) Subject: OpenBSD fixed for lib/DtSvc. X-Git-Tag: 2.2.0b~83^2~41 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=185ec249994bdb4ea61da5fc7de32aeb8ddb1eeb;p=oweals%2Fcde.git OpenBSD fixed for lib/DtSvc. --- diff --git a/cde/lib/DtSvc/DtCodelibs/filegen.C b/cde/lib/DtSvc/DtCodelibs/filegen.C index e29f1c3c..ad8c8de4 100644 --- a/cde/lib/DtSvc/DtCodelibs/filegen.C +++ b/cde/lib/DtSvc/DtCodelibs/filegen.C @@ -272,10 +272,11 @@ _SHXbuf::filegen() // Find the longest match if we are doing completion: if (completion) { + long i; // compare all entries to a copy of the first entry strcpy(filebuf, &bufptr[long(vec[0])]); - for (long i = 1; i < vec.size(); i++) + for (i = 1; i < vec.size(); i++) { register char *ref = filebuf; register char *ptr = &bufptr[long(vec[i])]; diff --git a/cde/lib/DtSvc/DtEncap/spc-termio.c b/cde/lib/DtSvc/DtEncap/spc-termio.c index 033453a3..89b7b4e5 100644 --- a/cde/lib/DtSvc/DtEncap/spc-termio.c +++ b/cde/lib/DtSvc/DtEncap/spc-termio.c @@ -36,7 +36,7 @@ #include #include -#if !defined(linux) +#if !defined(linux) && !defined(CSRG_BASED) #include #endif #include @@ -145,6 +145,7 @@ static struct modes_s Output_modes[] = { "OCRNL", OCRNL, "ONOCR", ONOCR, "ONLRET", ONLRET, +#if !defined(CSRG_BASED) "OFILL", OFILL, "OFDEL", OFDEL, "NLDLY", NLDLY, @@ -169,6 +170,7 @@ static struct modes_s Output_modes[] = { "FFDLY", FFDLY, "FF0", FF0, "FF1", FF1, +#endif END_OF_LIST, 0 }; diff --git a/cde/lib/DtSvc/DtUtil1/CmdMain.c b/cde/lib/DtSvc/DtUtil1/CmdMain.c index 00e64ec1..d57a2f4e 100644 --- a/cde/lib/DtSvc/DtUtil1/CmdMain.c +++ b/cde/lib/DtSvc/DtUtil1/CmdMain.c @@ -43,7 +43,7 @@ #ifdef __apollo #include "/sys5/usr/include/sys/termio.h" #else -#include +#include #endif #include #include @@ -989,7 +989,7 @@ _DtCmdCommandInvokerExecute ( if (commandPid == 0) { -#if defined(__hp_osf) || defined(__osf__) +#if defined(__hp_osf) || defined(__osf__) || defined(CSRG_BASED) setsid() ; #else (void) setpgrp (); diff --git a/cde/lib/DtSvc/DtUtil1/DbLoad.c b/cde/lib/DtSvc/DtUtil1/DbLoad.c index 7f0e242b..b0b753d1 100644 --- a/cde/lib/DtSvc/DtUtil1/DbLoad.c +++ b/cde/lib/DtSvc/DtUtil1/DbLoad.c @@ -104,6 +104,8 @@ extern void _DtDtsSeqReset(void); extern int _DtDtsNextDCSeq(void); extern int _DtDtsNextDASeq(void); +char **_DtsDbListDb(void); + int use_in_memory_db = False; static void diff --git a/cde/lib/DtSvc/DtUtil1/Dts.c b/cde/lib/DtSvc/DtUtil1/Dts.c index 4c61d8a9..4b5956c8 100644 --- a/cde/lib/DtSvc/DtUtil1/Dts.c +++ b/cde/lib/DtSvc/DtUtil1/Dts.c @@ -49,7 +49,6 @@ #include #include #include -#include #include #include #include @@ -59,6 +58,10 @@ * On HP MAXINT is defined in both and */ #undef MAXINT +#elif defined(CSRG_BASED) +#define MAXINT INT_MAX +#else +#include #endif #include #include diff --git a/cde/lib/DtSvc/DtUtil2/XlationSvc.c b/cde/lib/DtSvc/DtUtil2/XlationSvc.c index 4d7dc3dd..cbb6982d 100644 --- a/cde/lib/DtSvc/DtUtil2/XlationSvc.c +++ b/cde/lib/DtSvc/DtUtil2/XlationSvc.c @@ -2197,7 +2197,7 @@ int _DtXlateGetXlateEnv( /* then look up version number of execution host */ if (ret_AppExecEnvVersion) { -#if defined(sun) || defined(_AIX) || defined(USL) || defined(__uxp__) || defined(__osf__) || defined(linux) +#if defined(sun) || defined(_AIX) || defined(USL) || defined(__uxp__) || defined(__osf__) || defined(linux) || defined(CSRG_BASED) char version[SYS_NMLN+SYS_NMLN+2]; #else char version[UTSLEN+UTSLEN+2]; @@ -2250,7 +2250,7 @@ int _DtXlateGetXlateEnv( #error OSMAJORVERSION and/or OSMINORVERSION not defined #endif -#if defined(linux) +#if defined(linux) || defined(CSRG_BASED) sprintf(buf,"%s%s%s", STR(OSMAJORVERSION), nl_langinfo('.'), STR(OSMINORVERSION)); #else diff --git a/cde/lib/DtSvc/include/bms/sbstdinc.h b/cde/lib/DtSvc/include/bms/sbstdinc.h index 05711f1b..ed5ae36b 100644 --- a/cde/lib/DtSvc/include/bms/sbstdinc.h +++ b/cde/lib/DtSvc/include/bms/sbstdinc.h @@ -59,7 +59,7 @@ /************************************************************************/ /* Domain/OS BSD has bzero(), bcmp(), and bcopy() defined. */ -#if !defined(apollo) || !defined(__bsd) +#if !(defined(apollo) && defined(__bsd)) && !defined(CSRG_BASED) #if defined(__STDC__) #if !defined(linux) && !defined(__osf__) && !defined(_XFUNCS_H_) diff --git a/cde/lib/DtSvc/include/codelibs/dynarray.h b/cde/lib/DtSvc/include/codelibs/dynarray.h index 8c2e88c0..51f03cd2 100644 --- a/cde/lib/DtSvc/include/codelibs/dynarray.h +++ b/cde/lib/DtSvc/include/codelibs/dynarray.h @@ -36,10 +36,10 @@ #ifndef __DYNARRAY_H_ #define __DYNARRAY_H_ -#if !defined(linux) +#if !defined(linux) && !defined(CSRG_BASED) #include #endif -#if defined(USL) || defined(__uxp__) || defined(__osf__) || defined(sun) || defined(linux) +#if defined(USL) || defined(__uxp__) || defined(__osf__) || defined(sun) || defined(linux) || defined(CSRG_BASED) #define _DELETE_ARRAY(sz) delete[] #else #define _DELETE_ARRAY(sz) delete[(sz)] diff --git a/cde/lib/DtSvc/include/codelibs/privbuf.h b/cde/lib/DtSvc/include/codelibs/privbuf.h index e3a538bb..23f78407 100644 --- a/cde/lib/DtSvc/include/codelibs/privbuf.h +++ b/cde/lib/DtSvc/include/codelibs/privbuf.h @@ -48,7 +48,7 @@ typedef void (*privbuf_func)(void *v); #include #include -#if defined(__osf__) || defined(sun) || defined(linux) +#if defined(__osf__) || defined(sun) || defined(linux) || defined(CSRG_BASED) // The DEC C++ compiler rejects valid inline declarations, claiming // they have both internal and external linkage. #else diff --git a/cde/lib/DtSvc/include/codelibs/stringx.h b/cde/lib/DtSvc/include/codelibs/stringx.h index 6ccc6cea..0d878b67 100644 --- a/cde/lib/DtSvc/include/codelibs/stringx.h +++ b/cde/lib/DtSvc/include/codelibs/stringx.h @@ -75,7 +75,7 @@ extern "C" #ifdef __cplusplus char *strtokx(char *&ptr, const char *sep); -# if !defined(__osf__) && !defined(linux) +# if !defined(__osf__) && !defined(linux) && !defined(CSRG_BASED) char **strsep(const char *str, const char *sep, boolean whsp = TRUE, int *num = NULL); # if !defined(__osf__) @@ -85,7 +85,7 @@ extern "C" #else /* __STDC__ */ char *strtokx(char **ptr, const char *sep); -# if !defined(linux) +# if !defined(linux) && !defined(CSRG_BASED) char **strsep(const char *str, const char *sep, boolean whsp, int *num); #endif @@ -137,7 +137,7 @@ inline void strfree(const char *s) { if (s != NULL) free((char *)s); } #else inline void strfree(const char *s) -#if defined(__hpux) || defined(__osf__) +#if defined(__hpux) || defined(__osf__) || defined(CSRG_BASED) { if (s != NULL) free((void *)s); } #else { if (s != NULL) free((const void *)s); }