Fix warnings on FreeBSD

cde/lib/DtSvc/DtCodelibs/Imakefile

@@ -17,7 +17,7 @@ XCOMM (c) Copyright 1996 Hitachi.
 #define LibCreate	NO
 
 #define CplusplusSource	YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
+DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
 
 #include <Threads.tmpl>
 

cde/lib/DtSvc/DtEncap/pty.c

@@ -61,10 +61,6 @@
 #include <sys/ptyio.h>
 #endif
 
-#if defined(__cplusplus)
-#include <osfcn.h>
-#endif
-
 #if defined(__apollo) && !defined(ONLCR) 
 # define ONLCR 0		/* This guy (XPG3), not on apollo yet */
 #endif

cde/lib/DtSvc/DtUtil1/DbLoad.c

@@ -53,11 +53,11 @@
 #include <ndir.h>
 #else
 
-#if defined(sun)
+#if defined(sun) || defined(CSRG_BASED)
 #include <dirent.h>
 #else
 #include <sys/dir.h>
-#endif				/* sun */
+#endif				/* sun || CSRD_BASED */
 
 #endif				/* __hpux */
 

cde/lib/DtSvc/DtUtil1/DtsInit.c

@@ -51,11 +51,11 @@
 #include <ndir.h>
 #else
 
-#if defined(sun)
+#if defined(sun) || defined(CSRG_BASED)
 #include <dirent.h>
 #else
 #include <sys/dir.h>
-#endif				/* sun */
+#endif				/* sun || CSRG_BASED */
 
 #endif				/* __hpux */
 

cde/lib/DtSvc/DtUtil2/DtosP.h

@@ -150,6 +150,9 @@ static char SCCSID[] = "OSF/Motif: @(#)_DtosP.h	4.16 91/09/12";
 
 
 # ifdef __GNUC__
+#  ifdef alloca
+#  undef alloca
+#  endif
 #  define alloca __builtin_alloca
 #  define ALLOCATE_LOCAL(size) alloca((int)(size))
 #  define DEALLOCATE_LOCAL(ptr)  /* as nothing */

cde/lib/DtSvc/DtUtil2/FileUtil.c

@@ -40,11 +40,11 @@
 #ifdef __hpux
 #include <ndir.h>		/* opendir(), directory(3C) */
 #else
-#if defined(sun)
+#if defined(sun) || defined(CSRG_BASED)
 #include <dirent.h>		/* opendir(), directory(3C) */
 #else
 #include <sys/dir.h>
-#endif /* sun */
+#endif /* sun || CSRG_BASED */
 #endif /* __hpux */
 
 #include <X11/Xlib.h>

cde/lib/DtSvc/DtUtil2/Utility.c

@@ -38,7 +38,7 @@
 #ifdef __hpux
 #include <ndir.h>
 #else
-#if defined(sun)
+#if defined(sun) || defined(CSRG_BASED)
 #include <dirent.h>
 #else
 #include <sys/dir.h>

cde/lib/DtSvc/include/bms/usersig.h

@@ -33,7 +33,7 @@
  */
 
 #ifndef _usersig_h
-#define _usesig_h
+#define _usersig_h
 
 /* -------------------------------------------- */
 /* Requires:					*/