debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://git.code.sf.net/p/cdesktopenv/code

Browse Source
This commit is contained in:
Peter Howkins
2012-08-13 10:31:07 +01:00
parent 1dd2eaf854 bf8c5e674f
commit 0ecef859cf
541 changed files with 4013 additions and 877 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cde/lib/DtSvc/DtCodelibs/buf.C
View File

@@ -118,7 +118,8 @@ _SHXbuf::reset(boolean g, boolean comp)
char **
_SHXbuf::vector()
{
for (int i = 0; i < vec.size(); i++)
int i;
for (i = 0; i < vec.size(); i++)
vec[i] = &buf[long(vec[i])];
vec[i] = NULL;

3
cde/lib/DtSvc/DtCodelibs/filegen.C
View File

@@ -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])];

4
cde/lib/DtSvc/DtEncap/spc-termio.c
View File

@@ -36,7 +36,7 @@
#include <bms/stringbuf.h>
#include <termios.h>
#if !defined(linux)
#if !defined(linux) && !defined(CSRG_BASED)
#include <sys/termio.h>
#endif
#include <codelibs/stringx.h>
@@ -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
};

4
cde/lib/DtSvc/DtUtil1/CmdMain.c
View File

@@ -43,7 +43,7 @@
#ifdef __apollo
#include "/sys5/usr/include/sys/termio.h"
#else
#include <termio.h>
#include <termios.h>
#endif
#include <errno.h>
#include <unistd.h>
@@ -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 ();

2
cde/lib/DtSvc/DtUtil1/DbLoad.c
View File

@@ -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

2
cde/lib/DtSvc/DtUtil1/DbReader.c
View File

@@ -34,7 +34,7 @@
#include <stdio.h>
#include <ctype.h>
#include <malloc.h>
#include <stdlib.h>
#include <limits.h>
#include <string.h>
#include <X11/X.h>

5
cde/lib/DtSvc/DtUtil1/Dts.c
View File

@@ -49,7 +49,6 @@
#include <string.h>
#include <stdlib.h>
#include <ctype.h>
#include <values.h>
#include <sys/mman.h>
#include <stdio.h>
#include <fcntl.h>
@@ -59,6 +58,10 @@
* On HP MAXINT is defined in both <values.h> and <sys/param.h>
*/
#undef MAXINT
#elif defined(CSRG_BASED)
#define MAXINT INT_MAX
#else
#include <values.h>
#endif
#include <sys/param.h>
#include <sys/errno.h>

1
cde/lib/DtSvc/DtUtil1/MMDb.c
View File

@@ -32,7 +32,6 @@
#include <sys/types.h>
#include <unistd.h>
#include <malloc.h>
#include <sys/utsname.h>
#include <stdlib.h>

2
cde/lib/DtSvc/DtUtil1/intarray.c
View File

@@ -26,7 +26,7 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/mman.h>
#include <malloc.h>
#include <stdlib.h>
#include <string.h>
#include "DtHash.h"
#include "DtShmDb.h"

1
cde/lib/DtSvc/DtUtil1/inttab.c
View File

@@ -37,7 +37,6 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/mman.h>
#include <malloc.h>
#include <string.h>
#include "DtHash.h"
#include "DtShmDb.h"

4
cde/lib/DtSvc/DtUtil2/XlationSvc.c
View File

@@ -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

2
cde/lib/DtSvc/include/bms/sbstdinc.h
View File

@@ -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_)

4
cde/lib/DtSvc/include/codelibs/dynarray.h
View File

@@ -36,10 +36,10 @@
#ifndef __DYNARRAY_H_
#define __DYNARRAY_H_
#if !defined(linux)
#if !defined(linux) && !defined(CSRG_BASED)
#include <generic.h>
#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)]

2
cde/lib/DtSvc/include/codelibs/privbuf.h
View File

@@ -48,7 +48,7 @@ typedef void (*privbuf_func)(void *v);
#include <stddef.h>
#include <stdlib.h>
#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

8
cde/lib/DtSvc/include/codelibs/stringx.h
View File

@@ -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
@@ -125,7 +125,7 @@ extern size_t nl_strlen(); /* __OBSOLETE */
#if defined(__cplusplus)
}
#if defined(apollo) || defined(__aix) || defined(USL) || defined(__uxp__) || defined(__osf__)
#if defined(apollo) || defined(__aix) || defined(USL) || defined(__uxp__) || defined(__osf__) || defined(linux) || defined(CSRG_BASED)
#include <stdlib.h>
#else
#include <malloc.h>
@@ -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); }