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

cde/lib/DtSvc/DtUtil1/CmdMain.c

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

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

cde/lib/DtSvc/DtUtil1/DbReader.c

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

cde/lib/DtSvc/DtUtil1/Dts.c

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

cde/lib/DtSvc/DtUtil1/MMDb.c

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

cde/lib/DtSvc/DtUtil1/intarray.c

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

cde/lib/DtSvc/DtUtil1/inttab.c

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