OpenIndiana and Solaris port

cde/programs/backdrops/SunLogo.pm

@@ -0,0 +1,57 @@
+/* XPM */
+static char * SunLogo[] = {
+/* width height ncolors cpp [x_hot y_hot] */
+"48 48 3 1 0 0",
+/* colors */
+"     s #727288889f9f m white c #bbbbccccdddd",
+".    s #9191a8a8bfbf m black c #9191a8a8bfbf",
+"+    s #bbbbccccdddd m black c #727288889f9f",
+/* pixels */
+" ... .+++. .+++. .+++++. ... .+++. .+++. .+++++.",
+".   .+++. .+++. .+++.+++.   .+++. .+++. .+++.+++",
+".   .++. .+++. .+++. .++.   .++. .+++. .+++. .++",
+".   .+++.+++. .+++. .+++.   .+++.+++. .+++. .+++",
+" ... .+++++. .+++. .+++. ... .+++++. .+++. .+++.",
+".+++. .+++. .+++. .+++. .+++. .+++. .+++. .+++. ",
+"+++++. ... .+++. .+++. .+++++. ... .+++. .+++. .",
+"++.+++.   .+++. .+++. .+++.+++.   .+++. .+++. .+",
+"+. .+++. .+++. .+++.  .++. .+++. .+++. .+++.  .+",
+"++. .+++. .+. .+++. . .+++. .+++. .+. .+++. . .+",
+"+++. .+++. . .+++. .+. .+++. .+++. . .+++. .+. .",
+".+++. .+++. .+++. .+++. .+++. .+++. .+++. .+++. ",
+" .+++. .+++. .+. . .+++. .+++. .+++. .+. . .+++.",
+". .+++. .+++. . .+. .+++. .+++. .+++. . .+. .+++",
+"+. .+++. .+++. .+++. .+++. .+++. .+++. .+++. .++",
+"++. .+++. .+. . .+++. .+++. .+++. .+. . .+++. .+",
+"+++. .+++. . .+. .+++. .+++. .+++. . .+. .+++. .",
+".+++. .+++. .+++. .+++. .+++. .+++. .+++. .+++. ",
+" .+++. .+. .+++. . .+++. .+++. .+. .+++. . .+++.",
+". .+++. . .+++. .+. .+++. .+++. . .+++. .+. .+++",
+"+. .++.  .+++. .+++. .+++. .++.  .+++. .+++. .++",
+"++.+++. .+++. .+++.   .+++.+++. .+++. .+++.   .+",
+"+++++. .+++. .+++. ... .+++++. .+++. .+++. ... .",
+".+++. .+++. .+++. .+++. .+++. .+++. .+++. .+++. ",
+" ... .+++. .+++. .+++++. ... .+++. .+++. .+++++.",
+".   .+++. .+++. .+++.+++.   .+++. .+++. .+++.+++",
+".   .++. .+++. .+++. .++.   .++. .+++. .+++. .++",
+".   .+++.+++. .+++. .+++.   .+++.+++. .+++. .+++",
+" ... .+++++. .+++. .+++. ... .+++++. .+++. .+++.",
+".+++. .+++. .+++. .+++. .+++. .+++. .+++. .+++. ",
+"+++++. ... .+++. .+++. .+++++. ... .+++. .+++. .",
+"++.+++.   .+++. .+++. .+++.+++.   .+++. .+++. .+",
+"+. .+++. .+++. .+++.  .++. .+++. .+++. .+++.  .+",
+"++. .+++. .+. .+++. . .+++. .+++. .+. .+++. . .+",
+"+++. .+++. . .+++. .+. .+++. .+++. . .+++. .+. .",
+".+++. .+++. .+++. .+++. .+++. .+++. .+++. .+++. ",
+" .+++. .+++. .+. . .+++. .+++. .+++. .+. . .+++.",
+". .+++. .+++. . .+. .+++. .+++. .+++. . .+. .+++",
+"+. .+++. .+++. .+++. .+++. .+++. .+++. .+++. .++",
+"++. .+++. .+. . .+++. .+++. .+++. .+. . .+++. .+",
+"+++. .+++. . .+. .+++. .+++. .+++. . .+. .+++. .",
+".+++. .+++. .+++. .+++. .+++. .+++. .+++. .+++. ",
+" .+++. .+. .+++. . .+++. .+++. .+. .+++. . .+++.",
+". .+++. . .+++. .+. .+++. .+++. . .+++. .+. .+++",
+"+. .++.  .+++. .+++. .+++. .++.  .+++. .+++. .++",
+"++.+++. .+++. .+++.   .+++.+++. .+++. .+++.   .+",
+"+++++. .+++. .+++. ... .+++++. .+++. .+++. ... .",
+".+++. .+++. .+++. .+++. .+++. .+++. .+++. .+++. "};

cde/programs/dtaction/Imakefile

@@ -1,5 +1,6 @@
 XCOMM $TOG: Imakefile /main/9 1998/04/06 13:11:38 mgreess $
 
+ DEPEND_DEFINES = $(DEPENDDEFINES)
        INCLUDES = -I.
 
 DEPLIBS = $(DEPDTSVCLIB) $(DEPTTLIB) $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXLIB)

cde/programs/dtappbuilder/src/ab.tmpl

@@ -50,8 +50,8 @@ default_target: all
 /*
  * -xF and -M cause reordering of executable
  */
-LOCAL_LDFLAGS = -M Mapfile
-EXTRA_DEFINES = -D_POSIX_SOURCE=1 -Xa -xF
+LOCAL_LDFLAGS =
+EXTRA_DEFINES = -D_POSIX_SOURCE=1
 
 clean::
 	touch .make.state

cde/programs/dtappbuilder/src/abmf/Imakefile

@@ -21,8 +21,9 @@ XCOMM (c) Copyright 1996 Hitachi.
 #include "../ab.tmpl"
 #include "../ab.rules"
 
-    INCLUDES = -I. -I$(ABINCLUDES)
-     DEFINES =
+      INCLUDES = -I. -I$(ABINCLUDES)
+DEPEND_DEFINES = $(DEPENDDEFINES)
+       DEFINES =
 
 SOURCES.h.shipped =
 

cde/programs/dtappbuilder/src/libABil/Imakefile

@@ -29,8 +29,9 @@ XCOMM (c) Copyright 1996 Hitachi.
 #include "../ab.tmpl"
 #include "../ab.rules"
 
-    INCLUDES = -I. -I$(ABINCLUDES)
-     DEFINES =
+      INCLUDES = -I. -I$(ABINCLUDES)
+DEPEND_DEFINES = $(DEPENDDEFINES)
+       DEFINES =
 
 SOURCES.h.shipped=
 

cde/programs/dtappbuilder/src/libAButil/Imakefile

@@ -8,7 +8,7 @@ XCOMM $XConsortium: Imakefile /main/10 1996/10/09 14:03:49 drk $
 #define LibInstall	NO
 
 #define CplusplusSource	YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
+DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
 
 #include "../ab.tmpl"
 #include "../ab.rules"

cde/programs/dtcalc/Imakefile

@@ -1,5 +1,6 @@
 XCOMM $TOG: Imakefile /main/11 1997/09/05 11:28:15 samborn $
 
+ DEPEND_DEFINES = $(DEPENDDEFINES)
         DEFINES = -DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\"
        INCLUDES = -I.
 
@@ -17,7 +18,7 @@ SYS_LIBRARIES = -lmsaa -liconv
 #endif
 
 #if defined (SunArchitecture)
-SYS_LIBRARIES = -lintl -lsunmath -lm -ldl
+SYS_LIBRARIES = -lintl -lm -ldl
 #endif
 
 #if defined (USLArchitecture)

cde/programs/dtcm/dtcm/Imakefile

@@ -12,6 +12,7 @@ LOCAL_LIBRARIES = ../libDtCmP/libDtCmP.a $(CSALIB) DtClientLibs
 
  OSMAJORVERSION = OSMajorVersion
  OSMINORVERSION = OSMinorVersion
+ DEPEND_DEFINES = $(DEPENDDEFINES)
         DEFINES = -DREL="$(OSMAJORVERSION)$(OSMINORVERSION)" \
 	-DRELMAJOR="$(OSMAJORVERSION)" -DRELMINOR="$(OSMINORVERSION)" \
 	$(ICONV_INBUF_DEFINE)

cde/programs/dtcm/libDtCmP/Imakefile

@@ -12,6 +12,7 @@ INCLUDES = -I. -I$(CSASRC)
 OSMAJORVERSION = OSMajorVersion
 OSMINORVERSION = OSMinorVersion
 
+DEPEND_DEFINES = $(DEPENDDEFINES)
 DEFINES = -DRFC_MIME -DLINE_COUNT -DV2 -DOW_I18N \
 	-DREL="$(OSMAJORVERSION)$(OSMINORVERSION)" \
 	-DRELMAJOR="$(OSMAJORVERSION)" -DRELMINOR="$(OSMINORVERSION)"
@@ -38,6 +39,8 @@ OBJS =	cm_tty.o	cmfns.o		dtfns.o \
 	getdate.o	props.o		resource.o \
 	timeops.o	util.o
 
+YaccFileNoFlags(getdate)
+
 #include <Library.tmpl>
 
 DependTarget()

cde/programs/dtcreate/Imakefile

@@ -14,6 +14,7 @@ XCOMM
  * It should be set when necessary to the real library macro name.
  */
 
+ DEPEND_DEFINES = $(DEPENDDEFINES)
        INCLUDES = -I.
 #if defined (SunArchitecture)
 DEPLIBS = $(DEPDTWIDGETLIB) $(DEPDTSVCLIB) \
@@ -42,7 +43,7 @@ SYS_LIBRARIES = -lm -liconv
 #endif
 
 #if defined (SunArchitecture)
-SYS_LIBRARIES = -lm -ldl -lC
+SYS_LIBRARIES = -lm -ldl
 #endif /* SunArchitecture */
 
 #if defined (USLArchitecture)

cde/programs/dtdocbook/tcl/Imakefile

@@ -28,6 +28,8 @@ TCL_LIBRARY =	TclLibrary
 TCL_LIBRARY =	$(prefix)/tcl$(VERSION)
 #endif
 
+DEPEND_DEFINES = $(DEPENDDEFINES)
+
 #if defined(SunArchitecture)
 EXTRA_DEFINES = -DTCL_LIBRARY=\"${TCL_LIBRARY}\" \
 	-DNO_UNION_WAIT -DHAVE_UNISTD_H -DNEED_MATHERR \

cde/programs/dtexec/Imakefile

@@ -2,6 +2,7 @@ XCOMM $XConsortium: Imakefile /main/7 1996/09/14 15:17:32 drk $
 
 DEPLIBS = $(DEPTTLIB) $(DEPXTOOLLIB) $(DEPXLIB)
 LOCAL_LIBRARIES = $(TTLIB) $(XTOOLLIB) $(XLIB)
+DEPEND_DEFINES = $(DEPENDDEFINES)
 DEFINES = -DMSGLOG_CLIENT_ONLY
 INCLUDES = -I. 
 

cde/programs/dtfile/Imakefile

@@ -9,6 +9,7 @@ ForceSubdirs($(SUBDIRS))
 DependSubdirs($(SUBDIRS))
 
 
+DEPEND_DEFINES = $(DEPENDDEFINES)
 DEFINES = -DMULTIBYTE -DSHAPE -D_ILS_MACROS -DSUN_PERF \
 	-DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\" \
 	-DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\" \

cde/programs/dtfile/dtcopy/Imakefile

@@ -1,5 +1,6 @@
 XCOMM $XConsortium: Imakefile /main/7 1996/09/14 15:17:43 drk $
 
+DEPEND_DEFINES = $(DEPENDDEFINES)
 DEFINES = -DSHAPE
 
 DEPLIBS = DepDtClientLibs

cde/programs/dthello/Imakefile

@@ -11,7 +11,7 @@ EXTRA_DEFINES = -DHP_COLOR
 #endif
 
 #if defined(SunArchitecture)
-SYS_LIBRARIES = -lm -ldl -lgen -lC
+SYS_LIBRARIES = -lm -ldl -lgen
 #endif
 
 #if defined(USLArchitecture)

cde/programs/dthelp/dthelpdemo/Imakefile

@@ -10,6 +10,7 @@ XCOMM $XConsortium: Imakefile /main/7 1996/09/14 15:26:24 drk $
 
 PROGRAMS = dthelpdemo
 
+DEPEND_DEFINES = $(DEPENDDEFINES)
 DEFINES = -D_BMS
 INCLUDES =  -I.
 

cde/programs/dthelp/dthelpview/Imakefile

@@ -1,6 +1,7 @@
 XCOMM $XConsortium: Imakefile /main/7 1996/09/14 15:26:44 drk $
 PROGRAMS = dthelpview
 
+DEPEND_DEFINES = $(DEPENDDEFINES)
 DEFINES = -D_BMS
 INCLUDES = -I. 
 

cde/programs/dthelp/parser/canon1/build/build.c

@@ -71,5 +71,4 @@ while (TRUE)
     #include "case.c"
     if (m_token == ENDFILE) exit(FALSE) ;
     }
-    return 0;
 }

cde/programs/dthelp/parser/canon1/build/param.c

@@ -267,9 +267,9 @@ switch (newpar->type)
 	      ret = mbtowc(string, " ", 1);
 	      }
 	  }
-      return ;
     }
     (void) ret;
+    return;
 }
 
 /* Called at end of parameter attribute list rule */

cde/programs/dthelp/parser/canon1/build/scan.c

@@ -160,13 +160,13 @@ while (TRUE)
 	char mbyte[32]; /* bigger than the biggest multibyte char */
 
 	ret = wctomb(mbyte, c);
+	(void) ret;
 
 	fprintf(stderr, "\n'%s' (%d)", mbyte, c);
 	fprintf(m_errfile, "\n'%s' (%d)", mbyte, c);
 	m_error("Unexpected character");
 	}
     } /* End while */
-    (void) ret;
 }   /* End scan */
 
 #include "scanutil.c"

cde/programs/dthelp/parser/canon1/helptag/Imakefile

@@ -60,7 +60,7 @@ EXTRA_LOAD_FLAGS = -Wl,-a archive
 #endif
 
 #if defined (SunArchitecture)
-SYS_LIBRARIES = -lm -ldl -lgen -lC
+SYS_LIBRARIES = -lm -ldl -lgen
 #endif /* SunArchitecture */
 
 all:: $(OBJS)

cde/programs/dthelp/parser/canon1/parser/Imakefile

@@ -78,7 +78,7 @@ LOCAL_LIBRARIES = $(HELPUTILLIB)
 SYS_LIBRARIES = $(XLIB) DtClientSysLibs
 
 #if defined (SunArchitecture)
-SYS_LIBRARIES = $(XLIB) -lm -ldl -lgen -lC
+SYS_LIBRARIES = $(XLIB) -lm -ldl -lgen
 #endif /* SunArchitecture */
 
 all:: $(HELPTAGSRC)/dthelp_ctag1

cde/programs/dthelp/parser/canon1/util/malloc.c

@@ -98,7 +98,7 @@ void m_free(block, msg)
 #if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) || defined(__uxp__)
       snprintf(buffer, 32, "%5x:%5x",
         (unsigned int) ((unsigned long) block >> 16),
-        (unsigned int) block, msg) ;
+        (unsigned int) block) ;
 #else
       snprintf(buffer, 32, "  %9p", block) ;
 #endif

cde/programs/dthelp/parser/pass1/build/build.c

@@ -71,5 +71,4 @@ while (TRUE)
     #include "case.c"
     if (m_token == ENDFILE) exit(FALSE) ;
     }
-    return 0;
 }

cde/programs/dthelp/parser/pass1/build/param.c

@@ -267,9 +267,9 @@ switch (newpar->type)
 	      ret = mbtowc(string, " ", 1);
 	      }
 	  }
-      return ;
     }
     (void) ret;
+    return;
 }
 
 /* Called at end of parameter attribute list rule */

cde/programs/dthelp/parser/pass1/build/scan.c

@@ -160,13 +160,13 @@ while (TRUE)
 	char mbyte[32]; /* bigger than the biggest multibyte char */
 
 	ret = wctomb(mbyte, c);
+	(void) ret;
 
 	fprintf(stderr, "\n'%s' (%d)", mbyte, c);
 	fprintf(m_errfile, "\n'%s' (%d)", mbyte, c);
 	m_error("Unexpected character");
 	}
     } /* End while */
-    (void) ret;
 }   /* End scan */
 
 #include "scanutil.c"

cde/programs/dthelp/parser/pass1/helptag/Imakefile

@@ -60,7 +60,7 @@ EXTRA_LOAD_FLAGS = -Wl,-a archive
 #endif
 
 #if defined (SunArchitecture)
-SYS_LIBRARIES = -lm -ldl -lgen -lC
+SYS_LIBRARIES = -lm -ldl -lgen
 #endif /* SunArchitecture */
 
 all:: $(OBJS)

cde/programs/dthelp/parser/pass1/parser/Imakefile

@@ -78,7 +78,7 @@ LOCAL_LIBRARIES = $(HELPUTILLIB)
 SYS_LIBRARIES = $(XLIB) DtClientSysLibs
 
 #if defined (SunArchitecture)
-SYS_LIBRARIES = $(XLIB) -lm -ldl -lgen -lC
+SYS_LIBRARIES = $(XLIB) -lm -ldl -lgen
 #endif /* SunArchitecture */
 
 all:: $(HELPTAGSRC)/dthelp_htag1

cde/programs/dthelp/parser/pass1/util/malloc.c

@@ -98,7 +98,7 @@ void m_free(block, msg)
 #if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) || defined(__uxp__)
       snprintf(buffer, 32, "%5x:%5x",
         (unsigned int) ((unsigned long) block >> 16),
-        (unsigned int) block, msg) ;
+        (unsigned int) block) ;
 #else
       snprintf(buffer, 32, "  %9p", block) ;
 #endif

cde/programs/dthelp/parser/pass2/build/build.c

@@ -71,5 +71,4 @@ while (TRUE)
     #include "case.c"
     if (m_token == ENDFILE) exit(FALSE) ;
     }
-    return 0;
 }

cde/programs/dthelp/parser/pass2/build/param.c

@@ -267,9 +267,9 @@ switch (newpar->type)
 	      ret = mbtowc(string, " ", 1);
 	      }
 	  }
-      return ;
     }
     (void) ret;
+    return;
 }
 
 /* Called at end of parameter attribute list rule */

cde/programs/dthelp/parser/pass2/build/scan.c

@@ -160,13 +160,13 @@ while (TRUE)
 	char mbyte[32]; /* bigger than the biggest multibyte char */
 
 	ret = wctomb(mbyte, c);
+	(void) ret;
 
 	fprintf(stderr, "\n'%s' (%d)", mbyte, c);
 	fprintf(m_errfile, "\n'%s' (%d)", mbyte, c);
 	m_error("Unexpected character");
 	}
     } /* End while */
-    (void) ret;
 }   /* End scan */
 
 #include "scanutil.c"

cde/programs/dthelp/parser/pass2/htag2/Imakefile

@@ -52,7 +52,7 @@ EXTRA_LOAD_FLAGS = -Wl,-a archive
 #endif
 
 #if defined (SunArchitecture)
-SYS_LIBRARIES = -lm -ldl -lgen -lC
+SYS_LIBRARIES = -lm -ldl -lgen
 #endif /* SunArchitecture */
 
 all:: $(OBJS)

cde/programs/dthelp/parser/pass2/parser/Imakefile

@@ -69,7 +69,7 @@ LOCAL_LIBRARIES = $(SDLUTILLIB)
 SYS_LIBRARIES = $(XLIB) DtClientSysLibs
 
 #if defined (SunArchitecture)
-SYS_LIBRARIES = $(XLIB) -lm -ldl -lgen -lC
+SYS_LIBRARIES = $(XLIB) -lm -ldl -lgen
 #endif /* SunArchitecture */
 
 all:: $(HTAG2SRC)/dthelp_htag2

cde/programs/dthelp/parser/pass2/util/malloc.c

@@ -98,7 +98,7 @@ void m_free(block, msg)
 #if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) || defined(__uxp__)
       snprintf(buffer, 32, "%5x:%5x",
         (unsigned int) ((unsigned long) block >> 16),
-        (unsigned int) block, msg) ;
+        (unsigned int) block) ;
 #else
       snprintf(buffer, 32, "  %9p", block) ;
 #endif

cde/programs/dticon/Imakefile

@@ -13,8 +13,10 @@ XCOMM
  * It should be set when necessary to the real library macro name.
  */
 
-        DEFINES = -D__TOOLTALK
-       INCLUDES = -I.
+DEPEND_DEFINES = $(DEPENDDEFINES)
+DEFINES = -D__TOOLTALK
+INCLUDES = -I.
+
 #if defined (SunArchitecture)
 DEPLIBS = $(DEPDTWIDGETLIB) $(DEPDTSVCLIB) $(DEPTTLIB) \
                   $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXLIB)

cde/programs/dtinfo/DtMmdb/HardCopy/FPExceptions.h

@@ -34,7 +34,7 @@
 class hardCopyRendererException : public Exception
 {
 public:
-  DECLARE_EXCEPTION(hardCopyRendererException, Exception);
+  DECLARE_EXCEPTION(hardCopyRendererException, Exception)
 };
 
 #define CASTHCREXCEPT

cde/programs/dtinfo/DtMmdb/HardCopy/autoNumber.C

@@ -237,7 +237,7 @@ int autoNumberAlphabetic::alphaToInt(const char* alpha, enum CaseType a_case)
       expansionFactor *= base;
    }
 
-   x += int((pow(base, digits)-1) / (base-1)) - 1;
+   x += int((pow((double)base, digits)-1) / (base-1)) - 1;
   
    return x;
 }
@@ -270,7 +270,7 @@ const char* autoNumberAlphabetic::intToAlpha(int x, enum CaseType a_case)
      throw(CASTHCREXCEPT hardCopyRendererException());
    }
 
-   int digits = int(log((base-1)*x + base) / log(base));
+   int digits = int(log((double)(base-1)*x + base) / log((double)base));
 
    if ( digits > 50 ) {
      MESSAGE(cerr, "alphabetic autonumber value too large");
@@ -280,7 +280,7 @@ const char* autoNumberAlphabetic::intToAlpha(int x, enum CaseType a_case)
    //debug(cerr, digits);   
    //debug(cerr, (pow(base, digits)-1) / (25) -1);
 
-   x -= int((pow(base, digits)-1) / (base-1)) - 1;
+   x -= int((pow((double)base, digits)-1) / (base-1)) - 1;
 
    char* letters = 
 	(a_case == UPPER ) ? f_upperCaseLetters : f_lowerCaseLetters; 

cde/programs/dtinfo/DtMmdb/Imakefile

@@ -23,8 +23,10 @@ MMDB_SUBDIRS = HardCopy StyleSheet dti_cc
 
 #ifdef SharedDtMmdbReqs
 #ifdef SunArchitecture
-REQUIREDLIBS = SharedDtMmdbReqs -L/opt/SUNWspro/SC4.0/lib -Bstatic -lC -Bdynamic
+REQUIREDLIBS = SharedDtMmdbReqs
+#ifndef HasGcc2
 SHLIBLDFLAGS = -G
+#endif
 #else
 REQUIREDLIBS = SharedDtMmdbReqs
 #endif

cde/programs/dtinfo/DtMmdb/StyleSheet/DocParser.C

@@ -248,7 +248,8 @@ DocParser::process(istream &input, ostringstream &output,
     !defined(__uxp__) && \
     !defined(USL) && \
     !defined(linux) && \
-    !defined(CSRG_BASED)
+    !defined(CSRG_BASED) && \
+    !defined(sun)
 	    volatile
 #endif
 	    AttributeList *attrs = 0;
@@ -258,7 +259,8 @@ DocParser::process(istream &input, ostringstream &output,
     !defined(__uxp__) && \
     !defined(USL) && \
     !defined(linux) && \
-    !defined(CSRG_BASED)
+    !defined(CSRG_BASED) && \
+    !defined(sun)
 	    volatile
 #endif
 	    AttributeList *olias_attrs = 0;

cde/programs/dtinfo/DtMmdb/StyleSheet/Expression.C

@@ -141,15 +141,21 @@ BinaryOperatorNode::evaluate() const
 {
   // calculate children trees and then have feature value do the operation 
 
-#if !defined(SC3) && !defined(_IBMR2) && !defined(__uxp__) && !defined(__osf__) && !defined(USL) && !defined(linux) && !defined(CSRG_BASED)
+#if !defined(SC3) && !defined(_IBMR2) && !defined(__uxp__) && \
+    !defined(__osf__) && !defined(USL) && !defined(linux) && \
+    !defined(CSRG_BASED) && !defined(sun)
   volatile
 #endif
   FeatureValue *left =  0;
-#if !defined(SC3) && !defined(_IBMR2) && !defined(__uxp__) && !defined(__osf__) && !defined(USL) && !defined(linux) && !defined(CSRG_BASED)
+#if !defined(SC3) && !defined(_IBMR2) && !defined(__uxp__) && \
+    !defined(__osf__) && !defined(USL) && !defined(linux) && \
+    !defined(CSRG_BASED) && !defined(sun)
   volatile
 #endif
   FeatureValue *right = 0;
-#if !defined(SC3) && !defined(_IBMR2) && !defined(__uxp__) && !defined(__osf__) && !defined(USL) && !defined(linux) && !defined(CSRG_BASED)
+#if !defined(SC3) && !defined(_IBMR2) && !defined(__uxp__) && \
+    !defined(__osf__) && !defined(USL) && !defined(linux) && \
+    !defined(CSRG_BASED) && !defined(sun)
   volatile
 #endif
   FeatureValue *result = 0;

cde/programs/dtinfo/DtMmdb/StyleSheet/StyleSheetExceptions.h

@@ -44,21 +44,21 @@
 class StyleSheetException : public Exception
 {
 public:
-  DECLARE_EXCEPTION(StyleSheetException, Exception);
+  DECLARE_EXCEPTION(StyleSheetException, Exception)
   virtual ~StyleSheetException();
 };
 
 class StyleSheetSyntaxError : public StyleSheetException
 {
 public:
-  DECLARE_EXCEPTION(StyleSheetSyntaxError, StyleSheetException);
+  DECLARE_EXCEPTION(StyleSheetSyntaxError, StyleSheetException)
   
 };
 
 class badEvaluationException : public StyleSheetException
 {
 public:
-  DECLARE_EXCEPTION(badEvaluationException, StyleSheetException);
+  DECLARE_EXCEPTION(badEvaluationException, StyleSheetException)
 
   virtual ~badEvaluationException();
 };
@@ -66,13 +66,13 @@ public:
 class badCastException : public StyleSheetException
 {
 public:
-  DECLARE_EXCEPTION(badCastException, StyleSheetException);
+  DECLARE_EXCEPTION(badCastException, StyleSheetException)
 };
 
 class undefinedVariableException : public badEvaluationException
 {
 public:
-  DECLARE_EXCEPTION(undefinedVariableException, badEvaluationException);
+  DECLARE_EXCEPTION(undefinedVariableException, badEvaluationException)
 
   undefinedVariableException(const Symbol &v)
     : badEvaluationException(),
@@ -87,7 +87,7 @@ private:
 class undefinedAttributeException : public badEvaluationException
 {
 public:
-  DECLARE_EXCEPTION(undefinedAttributeException, badEvaluationException);
+  DECLARE_EXCEPTION(undefinedAttributeException, badEvaluationException)
 
   undefinedAttributeException(const Symbol &a)
     : badEvaluationException(),
@@ -101,38 +101,38 @@ private:
 class docParserException : public Exception
 {
 public:
-  DECLARE_EXCEPTION(docParserException, Exception);
+  DECLARE_EXCEPTION(docParserException, Exception)
 };
 
 class unknownTagException : public docParserException
 {
 public:
-  DECLARE_EXCEPTION(unknownTagException, docParserException);
+  DECLARE_EXCEPTION(unknownTagException, docParserException)
   
 };
 
 class docParserUnexpectedCharacter : public docParserException
 {
 public:
-  DECLARE_EXCEPTION(docParserUnexpectedCharacter, docParserException);
+  DECLARE_EXCEPTION(docParserUnexpectedCharacter, docParserException)
   
 };
 class docParserUnexpectedTag : public docParserException
 {
 public:
-  DECLARE_EXCEPTION(docParserUnexpectedTag, docParserException);
+  DECLARE_EXCEPTION(docParserUnexpectedTag, docParserException)
   
 };
 class docParserUnexpectedData : public docParserException
 {
 public:
-  DECLARE_EXCEPTION(docParserUnexpectedData, docParserException);
+  DECLARE_EXCEPTION(docParserUnexpectedData, docParserException)
   
 };
 class docParserUnexpectedEof : public docParserException
 {
 public:
-  DECLARE_EXCEPTION(docParserUnexpectedEof, docParserException);
+  DECLARE_EXCEPTION(docParserUnexpectedEof, docParserException)
   
 };
 

cde/programs/dtinfo/DtMmdb/StyleSheet/defToken.C

@@ -43,7 +43,8 @@
 
 #include <stdlib.h>
 
-#if !defined(__osf__) && !defined(USL) && !defined(linux) && !defined(CSRG_BASED)
+#if !defined(__osf__) && !defined(USL) && !defined(linux) && \
+    !defined(CSRG_BASED) && !defined(sun)
 #include <osfcn.h>
 #endif
 

cde/programs/dtinfo/DtMmdb/StyleSheet/tokenStyle.C

@@ -43,7 +43,8 @@
 
 #include <stdlib.h>
 
-#if !defined(__osf__) && !defined(USL) && !defined(linux) && !defined(CSRG_BASED)
+#if !defined(__osf__) && !defined(USL) && !defined(linux) && \
+    !defined(CSRG_BASED) && !defined(sun)
 #include <osfcn.h>
 #endif
 

cde/programs/dtinfo/DtMmdb/api/Imakefile

@@ -23,11 +23,11 @@ XCOMM		.../programs/dtinfo/mmdb/<subdir>/Imakefile
 #define LargePICTable	YES
 
 #define CplusplusSource	YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
+DEPEND_DEFINES = $(DEPENDDEFINES)
 
 XCOMM In DtMmdb we compile as C_API sources.
 DEFINES  = -DC_API
-INCLUDES = -I.. $(EXCEPTIONS_INCLUDES) -I../misc
+INCLUDES = $(CXXDEPENDINCLUDES) -I.. $(EXCEPTIONS_INCLUDES) -I../misc
 
 SRCS = base.C info_base.C info_lib.C smart_ptr.C transaction.C utility.C
 OBJS = $(SRCS:.C=.o)

cde/programs/dtinfo/DtMmdb/btree/Imakefile

@@ -23,11 +23,11 @@ XCOMM		.../programs/dtinfo/mmdb/<subdir>/Imakefile
 #define LargePICTable	YES
 
 #define CplusplusSource	YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
+DEPEND_DEFINES = $(DEPENDDEFINES)
 
 XCOMM In DtMmdb we compile as C_API sources.
 DEFINES  = -DC_API
-INCLUDES = -I.. $(EXCEPTIONS_INCLUDES)
+INCLUDES = $(CXXDEPENDINCLUDES) -I.. $(EXCEPTIONS_INCLUDES)
 
 SRCS = mmdb_btree.C 
 OBJS = $(SRCS:.C=.o)

cde/programs/dtinfo/DtMmdb/btree_berkeley/Imakefile

@@ -22,6 +22,7 @@ XCOMM		.../programs/dtinfo/mmdb/<subdir>/Imakefile
 #define LibCreate	NO
 #define LargePICTable	YES
 
+DEPEND_DEFINES = $(DEPENDDEFINES)
 DEFINES  = -DMEMMOVE
 INCLUDES = -I../ -I.
 

cde/programs/dtinfo/DtMmdb/btree_berkeley/compat.h

@@ -89,7 +89,8 @@ typedef unsigned int	sigset_t;
  * If your system's vsnprintf returns a char *, not an int,
  * change the 0 to a 1.
  */
-#if !defined(_AIX) && !defined(__osf__) && !defined(linux) && !defined(CSRG_BASED)
+#if !defined(_AIX) && !defined(__osf__) && !defined(linux) && \
+    !defined(CSRG_BASED) && !defined(sun)
 #define	VSPRINTF_CHARSTAR
 #endif
 

cde/programs/dtinfo/DtMmdb/compression/Imakefile

@@ -23,11 +23,11 @@ XCOMM		.../programs/dtinfo/mmdb/<subdir>/Imakefile
 #define LargePICTable	YES
 
 #define CplusplusSource	YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
+DEPEND_DEFINES = $(DEPENDDEFINES)
 
 XCOMM In DtMmdb we compile as C_API sources.
 DEFINES  = -DC_API
-INCLUDES = -I.. $(EXCEPTIONS_INCLUDES) 
+INCLUDES = $(CXXDEPENDINCLUDES) -I.. $(EXCEPTIONS_INCLUDES)
 
 NORMAL_SRCS = abs_agent.C zip.C huffman.C trie.C code.C lzss.C
 PARSER_SRCS = sgml.C ps.C

cde/programs/dtinfo/DtMmdb/compression/ps.C

@@ -43,7 +43,7 @@
 
 #include <stdlib.h>
 
-#if defined(__osf__) || defined(linux) || defined(CSRG_BASED)
+#if defined(__osf__) || defined(linux) || defined(CSRG_BASED) || defined(sun)
 #include <unistd.h>
 #else
 #if !defined(__uxp__) && !defined(USL)

cde/programs/dtinfo/DtMmdb/compression/sgml.C

@@ -43,7 +43,7 @@
 
 #include <stdlib.h>
 
-#if defined(__osf__) || defined(linux) || defined(CSRG_BASED)
+#if defined(__osf__) || defined(linux) || defined(CSRG_BASED) || defined(sun)
 #include <unistd.h>
 #else
 #if !defined(__uxp__) && !defined(USL)

cde/programs/dtinfo/DtMmdb/diskhash/Imakefile

@@ -23,11 +23,11 @@ XCOMM		.../programs/dtinfo/mmdb/<subdir>/Imakefile
 #define LargePICTable	YES
 
 #define CplusplusSource	YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
+DEPEND_DEFINES = $(DEPENDDEFINES)
 
 XCOMM In DtMmdb we compile as C_API sources.
 DEFINES  = -DC_API
-INCLUDES = -I.. $(EXCEPTIONS_INCLUDES)
+INCLUDES = $(CXXDEPENDINCLUDES) -I.. $(EXCEPTIONS_INCLUDES)
 
 SRCS = disk_bucket.C bucket_array.C disk_hash.C
 OBJS = $(SRCS:.C=.o)

cde/programs/dtinfo/DtMmdb/diskhash/disk_hash.C

@@ -298,8 +298,8 @@ void disk_hash::caching(disk_bucket& b, data_t& w, int slot_num)
 //debug(cerr, b.bnum());
 //debug(cerr, k_vector -> count());
 
-   int k = int((long)(*k_vector)[b.bnum()]);
-   int r = int((long)(*r_vector)[b.bnum()]);
+   int kv = int((long)(*k_vector)[b.bnum()]);
+   int rv = int((long)(*r_vector)[b.bnum()]);
 
 ///////////////////////////////////////////
 // cache all keys in the bycket except w.
@@ -316,7 +316,7 @@ void disk_hash::caching(disk_bucket& b, data_t& w, int slot_num)
       if ( x ) {
          hash_vector -> insert(
                    (voidPtr)(size_t)ind,
-                   x -> slot_num(k, r, p, hash_vector -> count())
+                   x -> slot_num(kv, rv, p, hash_vector -> count())
                               );
       }
 
@@ -331,7 +331,7 @@ void disk_hash::caching(disk_bucket& b, data_t& w, int slot_num)
 ////////////////////////////////////////
    hash_vector -> insert(
          (voidPtr)(size_t)slot_num,
-         w.slot_num(k, r, p, hash_vector -> count())
+         w.slot_num(kv, rv, p, hash_vector -> count())
                         );
 }
       
@@ -373,11 +373,11 @@ Boolean disk_hash::member(data_t& w, disk_bucket*& b, int& slot_num) const
 
    b = &bucket_vector -> get_bucket(hash);
 
-   int k = int((long)(*k_vector)[b -> bnum()]);
-   int r = int((long)(*r_vector)[b -> bnum()]);
+   int kv = int((long)(*k_vector)[b -> bnum()]);
+   int rv = int((long)(*r_vector)[b -> bnum()]);
 
    slot_num = 
-     int((long)(*hash_vector)[w.slot_num(k, r, p, hash_vector -> count())]);
+     int((long)(*hash_vector)[w.slot_num(kv, rv, p, hash_vector -> count())]);
 
 //debug(cerr, slot_num);
 

cde/programs/dtinfo/DtMmdb/dstr/Imakefile

@@ -23,11 +23,11 @@ XCOMM		.../programs/dtinfo/mmdb/<subdir>/Imakefile
 #define LargePICTable	YES
 
 #define CplusplusSource	YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
+DEPEND_DEFINES = $(DEPENDDEFINES)
 
 XCOMM In DtMmdb we compile as C_API sources.
 DEFINES  = -DC_API
-INCLUDES = -I.. $(EXCEPTIONS_INCLUDES)
+INCLUDES = $(CXXDEPENDINCLUDES) -I.. $(EXCEPTIONS_INCLUDES)
 
 SRCS =	set.C bset.C slist.C dlist_cell.C dlist.C heap.C \
 	void_ptr_array.C void_ptr_stack.C \

cde/programs/dtinfo/DtMmdb/dti_cc/cc_exceptions.h

@@ -45,7 +45,7 @@ extern int errno;
 class ccException : public Exception
 {
 public:
-   DECLARE_EXCEPTION(ccException, Exception);
+   DECLARE_EXCEPTION(ccException, Exception)
 
    virtual ~ccException() {};
 
@@ -63,7 +63,7 @@ protected:
    char* msg;
 
 public:
-   DECLARE_EXCEPTION(ccStringException, ccException);
+   DECLARE_EXCEPTION(ccStringException, ccException)
 
    ccStringException(char const* m) : msg((char*)m) {};
    ~ccStringException() {};
@@ -80,7 +80,7 @@ protected:
    int mindex;
 
 public:
-   DECLARE_EXCEPTION(ccBoundaryException, ccException);
+   DECLARE_EXCEPTION(ccBoundaryException, ccException)
 
    ccBoundaryException(int l, int h, int i) : 
      low(l), high(h), mindex(i) {};

cde/programs/dtinfo/DtMmdb/dti_excs/Destructable_il.hh

@@ -80,7 +80,7 @@ Destructable::~Destructable()
 inline void
 Destructable::destruct()
 {
-#if defined(linux) || defined(CSRG_BASED)
+#if defined(linux) || defined(CSRG_BASED) || defined(sun)
   delete this;
 #else
   // Have to call this here since some compilers don't allow

cde/programs/dtinfo/DtMmdb/dti_excs/Exceptions.C

@@ -162,7 +162,7 @@ Exceptions::set_error_handler (error_handler_t error_handler)
 void
 Exceptions::error (const char *message, error_type_t error_type)
 {
-  unsigned int bufferlen = 100;
+  const unsigned int bufferlen = 100;
   char buffer[3][bufferlen];
   static char *lines[3] = { buffer[0], buffer[1], buffer[2] };
   int len, count = 0;

cde/programs/dtinfo/DtMmdb/dti_excs/Imakefile

@@ -23,9 +23,9 @@ XCOMM		.../programs/dtinfo/mmdb/<subdir>/Imakefile
 #define LargePICTable	YES
 
 #define CplusplusSource	YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
+DEPEND_DEFINES = $(DEPENDDEFINES)
 
-#if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 3
+#if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 5
 EXCEPTION_DEFINES  = -DHAS_TERMINATE
 #endif
 

cde/programs/dtinfo/DtMmdb/dynhash/Imakefile

@@ -23,11 +23,11 @@ XCOMM		.../programs/dtinfo/mmdb/<subdir>/Imakefile
 #define LargePICTable	YES
 
 #define CplusplusSource	YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
+DEPEND_DEFINES = $(DEPENDDEFINES)
 
 XCOMM In DtMmdb we compile as C_API sources.
 DEFINES  = -DC_API
-INCLUDES = -I.. $(EXCEPTIONS_INCLUDES)
+INCLUDES = $(CXXDEPENDINCLUDES) -I.. $(EXCEPTIONS_INCLUDES)
 
 SRCS = data_t.C imp_bucket.C imp_die.C
 OBJS = $(SRCS:.C=.o)

cde/programs/dtinfo/DtMmdb/dynhash/data_t.C

@@ -257,6 +257,7 @@ Boolean data_t::binaryIn(buffer& buf)
 {
    char c; buf.get(c);
    flag = (data_t::flag_type)c;
+   char* cp;
 
    unsigned int sz;
 
@@ -277,7 +278,8 @@ Boolean data_t::binaryIn(buffer& buf)
 
         break;
    }
-   buf.get(*(char*)&dt);
+   cp = (char*)&dt;
+   buf.get(*(long*)cp);
    return true;
 }
 

cde/programs/dtinfo/DtMmdb/hmphf/Imakefile

@@ -23,11 +23,11 @@ XCOMM		.../programs/dtinfo/mmdb/<subdir>/Imakefile
 #define LargePICTable	YES
 
 #define CplusplusSource	YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
+DEPEND_DEFINES = $(DEPENDDEFINES)
 
 XCOMM In DtMmdb we compile as C_API sources.
 DEFINES  = -DC_API -DPORTABLE_DB
-INCLUDES = -I.. $(EXCEPTIONS_INCLUDES)
+INCLUDES = $(CXXDEPENDINCLUDES) -I.. $(EXCEPTIONS_INCLUDES)
 
 SRCS =	buckets.C	mphf_funcs.C	mphf_hash_table.C \
 	params.C	pattern.C	sorter.C

cde/programs/dtinfo/DtMmdb/index/Imakefile

@@ -23,11 +23,11 @@ XCOMM		.../programs/dtinfo/mmdb/<subdir>/Imakefile
 #define LargePICTable	YES
 
 #define CplusplusSource	YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
+DEPEND_DEFINES = $(DEPENDDEFINES)
 
 XCOMM In DtMmdb we compile as C_API sources.
 DEFINES  = -DC_API -DPORTABLE_DB
-INCLUDES = -I.. $(EXCEPTIONS_INCLUDES)
+INCLUDES = $(CXXDEPENDINCLUDES) -I.. $(EXCEPTIONS_INCLUDES)
 
 SRCS = 	btree_index.C		dyn_disk_index.C	dyn_index.C  \
 	dyn_memory_index.C	fast_mphf.C		hash.C \

cde/programs/dtinfo/DtMmdb/index/dyn_index.C

@@ -114,7 +114,7 @@ dyn_index::_insert_loc(data_t& intKey, const oid_t& id)
 MESSAGE(cerr, "in dyn_index insert()");
 debug(cerr, intKey);
 debug(cerr, id);
-debug(cerr, pos);
+debug(cerr, p);
 */
 
     if ( v_idx_agent_ptr -> member( intKey ) == true ) {
@@ -268,12 +268,12 @@ oid_list_handler* dyn_index::get_loc_list(const handler& t)
       ) {
 //MESSAGE(cerr, "in hash table");
 
-      int pos = int(long(intKey -> dt));
-//debug(cerr, pos);
+      int p = int(long(intKey -> dt));
+//debug(cerr, p);
       delete intKey;
 //MESSAGE(cerr, "dyn_index::get_loc_list() done");
 
-      return  (*v_inv_lists_hd) -> get_list(pos); 
+      return  (*v_inv_lists_hd) -> get_list(p);
 
    } else {
 //MESSAGE(cerr, "not in hash table");

cde/programs/dtinfo/DtMmdb/index/fast_mphf.h

@@ -119,6 +119,7 @@ public:
    Boolean init_map_tbls();
 
 // load the MPHF from files
+   using pstring::asciiIn;
    virtual io_status asciiIn(istream&);
 
 // compute a hash value for a key.

cde/programs/dtinfo/DtMmdb/mgrs/Imakefile

@@ -23,11 +23,11 @@ XCOMM		.../programs/dtinfo/mmdb/<subdir>/Imakefile
 #define LargePICTable	YES
 
 #define CplusplusSource	YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
+DEPEND_DEFINES = $(DEPENDDEFINES)
 
 XCOMM In DtMmdb we compile as C_API sources.
 DEFINES  = -DC_API -DCOMPACTED_DISK_REP -DPORTABLE_DB
-INCLUDES = -I.. $(EXCEPTIONS_INCLUDES)
+INCLUDES = $(CXXDEPENDINCLUDES) -I.. $(EXCEPTIONS_INCLUDES)
 
 SRCS = managers.C misc.C query_mgr.C template_mgr.C
 OBJS = $(SRCS:.C=.o)

cde/programs/dtinfo/DtMmdb/misc/unique_id.c

@@ -112,7 +112,7 @@ gethostid()
     return atoi(u.idnumber);
   abort();
 }
-#elif defined(SVR4)
+#elif defined(SVR4) && !defined(sun)
 static unsigned int
 gethostid()
 {

cde/programs/dtinfo/DtMmdb/object/Imakefile

@@ -23,11 +23,11 @@ XCOMM		.../programs/dtinfo/mmdb/<subdir>/Imakefile
 #define LargePICTable	YES
 
 #define CplusplusSource	YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
+DEPEND_DEFINES = $(DEPENDDEFINES)
 
 XCOMM In DtMmdb we compile as C_API sources.
 DEFINES  = -DC_API -DPORTABLE_DB
-INCLUDES = -I.. $(EXCEPTIONS_INCLUDES)
+INCLUDES = $(CXXDEPENDINCLUDES) -I.. $(EXCEPTIONS_INCLUDES)
 
 SRCS =	composite.C	compressed_pstring.C	cset.C \
 	dl_list.C	dl_list_cell.C		handler.C \

cde/programs/dtinfo/DtMmdb/object/long_pstring.h

@@ -82,7 +82,8 @@ public:
 */
 
 // print function
-   virtual io_status asciiIn(istream&) ;
+   using pstring::asciiIn;
+   virtual io_status asciiIn(istream&);
 
 protected:
    chunks_index *v_str_index;

cde/programs/dtinfo/DtMmdb/oliasdb/Imakefile

@@ -23,14 +23,14 @@ XCOMM		.../programs/dtinfo/mmdb/<subdir>/Imakefile
 #define LargePICTable	YES
 
 #define CplusplusSource	YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
+DEPEND_DEFINES = $(DEPENDDEFINES)
 
 #ifdef DtinfoClient
 DEFINES= -DC_API -DNO_DB_LOCK -DCDE_NEXT
 #else
 DEFINES= -DC_API -DNO_DB_LOCK $(BYTE_ORDER_DEFINES)
 #endif
-INCLUDES = -I.. $(EXCEPTIONS_INCLUDES) $(COMMON_CLASS_INCLUDES) -I../misc
+INCLUDES = $(CXXDEPENDINCLUDES) -I.. $(EXCEPTIONS_INCLUDES) $(COMMON_CLASS_INCLUDES) -I../misc
 
 BASE_SRCS =  \
 	asciiIn_filters.C 	collectionIterator.C \

cde/programs/dtinfo/DtMmdb/schema/Imakefile

@@ -23,11 +23,11 @@ XCOMM		.../programs/dtinfo/mmdb/<subdir>/Imakefile
 #define LargePICTable	YES
 
 #define CplusplusSource	YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
+DEPEND_DEFINES = $(DEPENDDEFINES)
 
 XCOMM In DtMmdb we compile as C_API sources.
 DEFINES  = -DC_API -DPORTABLE_DB
-INCLUDES = -I.. $(EXCEPTIONS_INCLUDES) -I../misc
+INCLUDES = $(CXXDEPENDINCLUDES) -I.. $(EXCEPTIONS_INCLUDES) -I../misc
 
 NORMAL_SRCS = desc.C store_desc.C object_dict.C \
 	stored_object_desc.C index_desc.C inv_desc.C \

cde/programs/dtinfo/DtMmdb/schema/object_dict.C

@@ -64,7 +64,7 @@ int replace_string_len;
 //extern FILE *yyin;
 
 extern int schemaparse();
-extern int schemarestart(FILE*);
+extern void schemarestart(FILE*);
 extern FILE *schemain;
 
 object_dict::object_dict() :

cde/programs/dtinfo/DtMmdb/schema/token.C

@@ -43,7 +43,7 @@
 
 #include <stdlib.h>
 
-#if defined(__osf__) || defined(linux) || defined(CSRG_BASED)
+#if defined(__osf__) || defined(linux) || defined(CSRG_BASED) || defined(sun)
 #include <unistd.h>
 #else
 #if !defined(__uxp__) && !defined(USL)

cde/programs/dtinfo/DtMmdb/storage/Imakefile

@@ -23,11 +23,11 @@ XCOMM		.../programs/dtinfo/mmdb/<subdir>/Imakefile
 #define LargePICTable	YES
 
 #define CplusplusSource	YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
+DEPEND_DEFINES = $(DEPENDDEFINES)
 
 XCOMM In DtMmdb we compile as C_API sources.
 DEFINES  = -DC_API -DPORTABLE_DB
-INCLUDES = -I.. $(EXCEPTIONS_INCLUDES)
+INCLUDES = $(CXXDEPENDINCLUDES) -I.. $(EXCEPTIONS_INCLUDES)
 
 SRCS =	abs_storage.C	chunks_index.C	heap_comp_funcs.C \
 	lru.C		page.C		page_cache.C \

cde/programs/dtinfo/DtMmdb/utility/Imakefile

@@ -23,11 +23,11 @@ XCOMM		.../programs/dtinfo/mmdb/<subdir>/Imakefile
 #define LargePICTable	YES
 
 #define CplusplusSource	YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
+DEPEND_DEFINES = $(DEPENDDEFINES)
 
 XCOMM In DtMmdb we compile as C_API sources.
 DEFINES  = -DC_API -DPORTABLE_DB
-INCLUDES = -I.. $(EXCEPTIONS_INCLUDES) -I../misc
+INCLUDES = $(CXXDEPENDINCLUDES) -I.. $(EXCEPTIONS_INCLUDES) -I../misc
 
 BASE_SRCS = \
 	funcs.C		ostring.C	pm_random.C	atoi_pearson.C \

cde/programs/dtinfo/DtMmdb/utility/filebuf.C

@@ -26,7 +26,8 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#if !defined(hpux) && !defined(__osf__) && !defined(USL) && !defined(linux) && !defined(CSRG_BASED)
+#if !defined(hpux) && !defined(__osf__) && !defined(USL) && \
+    !defined(linux) && !defined(CSRG_BASED) && !defined(sun)
 #include <sysent.h>
 #endif
 

cde/programs/dtinfo/DtMmdb/utility/funcs.h

@@ -53,11 +53,11 @@
 #define _funcs_h 1
 
 #if !defined(USL) && !defined(__osf__) && !defined(linux) && \
-    !defined(CSRG_BASED)
+    !defined(CSRG_BASED) && !defined(sun)
 #include <libc.h>
 #endif
 #if defined(hpux) || defined(sgi) || defined(USL) ||defined(__osf__) || \
-    defined(linux) || defined(CSRG_BASED)
+    defined(linux) || defined(CSRG_BASED) || defined(sun)
 #include <unistd.h>
 #else
 #include <sysent.h>

cde/programs/dtinfo/DtMmdb/utility/mmdb_exception.h

@@ -72,7 +72,7 @@ extern int errno;
 class mmdbException : public Exception
 {
 public:
-   DECLARE_EXCEPTION(mmdbException, Exception);
+   DECLARE_EXCEPTION(mmdbException, Exception)
 
    virtual ~mmdbException() {};
 
@@ -90,7 +90,7 @@ protected:
    char* msg;
 
 public:
-   DECLARE_EXCEPTION(stringException, mmdbException);
+   DECLARE_EXCEPTION(stringException, mmdbException)
 
    stringException(char const* m) : msg((char*)m) {};
    ~stringException() {};
@@ -104,7 +104,7 @@ class formatException : public stringException
 protected:
 
 public:
-   DECLARE_EXCEPTION(formatException, stringException);
+   DECLARE_EXCEPTION(formatException, stringException)
 
    formatException(char const* m) : stringException(m) {};
    ~formatException() {};
@@ -118,7 +118,7 @@ protected:
    int v_code;
 
 public:
-   DECLARE_EXCEPTION(intException, mmdbException);
+   DECLARE_EXCEPTION(intException, mmdbException)
 
    intException(int c) : v_code(c) {};
    ~intException() {};
@@ -133,7 +133,7 @@ class systemException : public intException
 {
 
 public:
-   DECLARE_EXCEPTION(systemException, intException);
+   DECLARE_EXCEPTION(systemException, intException)
 
    systemException(int c) : intException(c) {};
    ~systemException() {};
@@ -145,7 +145,7 @@ class streamException : public intException
 protected:
 
 public:
-   DECLARE_EXCEPTION(streamException, intException);
+   DECLARE_EXCEPTION(streamException, intException)
 
    streamException(int c) : intException(c) {};
    ~streamException() {};
@@ -160,7 +160,7 @@ protected:
    long mindex;
 
 public:
-   DECLARE_EXCEPTION(boundaryException, mmdbException);
+   DECLARE_EXCEPTION(boundaryException, mmdbException)
 
    boundaryException(long l, long h, long i) : 
      low(l), high(h), mindex(i) {};
@@ -173,7 +173,7 @@ public:
 class beginTransException: public mmdbException
 {
 public:
-   DECLARE_EXCEPTION(beginTransException, mmdbException);
+   DECLARE_EXCEPTION(beginTransException, mmdbException)
    beginTransException() {};
    ~beginTransException() {};
 };
@@ -181,7 +181,7 @@ public:
 class commitTransException: public mmdbException
 {
 public:
-   DECLARE_EXCEPTION(commitTransException, mmdbException);
+   DECLARE_EXCEPTION(commitTransException, mmdbException)
    commitTransException() {};
    ~commitTransException() {};
 };
@@ -189,7 +189,7 @@ public:
 class rollbackTransException: public mmdbException
 {
 public:
-   DECLARE_EXCEPTION(rollbackTransException, mmdbException);
+   DECLARE_EXCEPTION(rollbackTransException, mmdbException)
    rollbackTransException() {};
    ~rollbackTransException() {};
 };
@@ -202,7 +202,7 @@ protected:
    const char* f_name;
 
 public:
-   DECLARE_EXCEPTION(demoException, mmdbException);
+   DECLARE_EXCEPTION(demoException, mmdbException)
 
    demoException(const char* p, const char* n) : f_path(p), f_name(n) {};
    virtual ~demoException() {};

cde/programs/dtinfo/DtMmdb/utility/streambuf.C

@@ -23,7 +23,8 @@
 /* $XConsortium: streambuf.C /main/8 1996/08/21 15:55:14 drk $ */
 #include "utility/c_streambuf.h"
 
-#if defined(USL) || defined(__osf__) || defined(linux) || defined(CSRG_BASED)
+#if defined(USL) || defined(__osf__) || defined(linux) || \
+    defined(CSRG_BASED) || defined(sun)
 #include <stdlib.h>
 #else
 #include <libc.h>

cde/programs/dtinfo/clients/dtinfo_start/Imakefile

@@ -11,6 +11,7 @@ XCOMM $XConsortium: Imakefile /main/5 1996/06/11 17:45:12 cde-hal $
 
 NormalCplusplusObjectRule()
 
+DEPEND_DEFINES = $(DEPENDDEFINES)
 INCLUDES =  -I.
 
 #ifdef AIXArchitecture

cde/programs/dtinfo/dtinfo/src/Agents/Imakefile

@@ -1,6 +1,6 @@
 XCOMM $XConsortium: Imakefile /main/8 1996/08/21 15:41:09 drk $
 
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
+DEPEND_DEFINES = $(DEPENDDEFINES)
 CXXEXTRA_DEFINES = -DEXPAND_TEMPLATES
 
 MAKEFILEDEPS=Classlist.mk
@@ -10,11 +10,11 @@ LIBNAME=Agents
 NormalCplusplusObjectRule()
 
 #ifdef DoLicenseManagement
-INCLUDES=$(BROWSER_INCLUDES) $(MMDB_INCLUDES) $(LICENSE_L_INCLUDES)
+INCLUDES=$(CXXDEPENDINCLUDES) $(BROWSER_INCLUDES) $(MMDB_INCLUDES) $(LICENSE_L_INCLUDES)
 EXTRA_DEFINES=-DLICENSE_MANAGEMENT
 #else
 XCOMM Should remove LICENSE_L_INCLUDES from this list in this case
-INCLUDES=$(BROWSER_INCLUDES) $(COMMON_CLASS_INCLUDES)
+INCLUDES=$(CXXDEPENDINCLUDES) $(BROWSER_INCLUDES) $(COMMON_CLASS_INCLUDES)
 #endif
 #include "Classlist.mk"
 

cde/programs/dtinfo/dtinfo/src/Agents/LibraryAgentMotif.hh

@@ -30,7 +30,6 @@
 #include "UAS.hh"
 #include <X11/Intrinsic.h>
 
-class OutlineListView;
 class OutlineListView;
 class WTopLevelShell;
 class ScopeMenu;

cde/programs/dtinfo/dtinfo/src/Agents/NodePrintAgent.C

@@ -199,15 +199,15 @@ static char another_g_top_locator[4096] ;
  * DtHelpDialog widget action list - required by the DisplayArea
  */
 static XtActionsRec DrawnBActions[] =
-    {
-        {(char*)"DeSelectAll"    , _DtHelpDeSelectAll    },
-        {(char*)"SelectAll"      , _DtHelpSelectAll      },
-        {(char*)"ActivateLink"   , _DtHelpActivateLink   },
-        {(char*)"CopyToClipboard", _DtHelpCopyAction     },
-        {(char*)"PageUpOrDown"   , _DtHelpPageUpOrDown   },
-        {(char*)"PageLeftOrRight", _DtHelpPageLeftOrRight},
-        {(char*)"NextLink"       , _DtHelpNextLink       }
-    };
+  {
+    {(char*)"DeSelectAll"    , (DeSelectAll_ptr)_DtHelpDeSelectAll         },
+    {(char*)"SelectAll"      , (SelectAll_ptr)_DtHelpSelectAll             },
+    {(char*)"ActivateLink"   , (ActivateLink_ptr)_DtHelpActivateLink       },
+    {(char*)"CopyToClipboard", (CopyAction_ptr)_DtHelpCopyAction           },
+    {(char*)"PageUpOrDown"   , (PageUpOrDown_ptr)_DtHelpPageUpOrDown       },
+    {(char*)"PageLeftOrRight", (PageLeftOrRight_ptr)_DtHelpPageLeftOrRight },
+    {(char*)"NextLink"       , (NextLink_ptr)_DtHelpNextLink               }
+  };
 
 //-------  Functions --------------------------------------------
 

cde/programs/dtinfo/dtinfo/src/Agents/NodePrintAgent.hh

@@ -34,6 +34,21 @@
 
 #include "UAS.hh"
 
+typedef void _DtHelpDeSelectAll_t(_WidgetRec*,_XEvent*,char**,unsigned*);
+typedef _DtHelpDeSelectAll_t * DeSelectAll_ptr;
+typedef void _DtHelpSelectAll_t(_WidgetRec*,_XEvent*,char**,unsigned*);
+typedef _DtHelpSelectAll_t * SelectAll_ptr;
+typedef void _DtHelpActivateLink_t(_WidgetRec*,_XEvent*,char**,unsigned*);
+typedef _DtHelpActivateLink_t * ActivateLink_ptr;
+typedef void _DtHelpCopyAction_t(_WidgetRec*,_XEvent*,char**,unsigned*);
+typedef _DtHelpCopyAction_t * CopyAction_ptr;
+typedef void _DtHelpPageUpOrDown_t(_WidgetRec*,_XEvent*,char**,unsigned*);
+typedef _DtHelpPageUpOrDown_t * PageUpOrDown_ptr;
+typedef void _DtHelpPageLeftOrRight_t(_WidgetRec*,_XEvent*,char**,unsigned*);
+typedef _DtHelpPageLeftOrRight_t * PageLeftOrRight_ptr;
+typedef void _DtHelpNextLink_t(_WidgetRec*,_XEvent*,char**,unsigned*);
+typedef _DtHelpNextLink_t * NextLink_ptr;
+
 class NodeViewInfo;
 class NodeHandle;
 class Manager;

cde/programs/dtinfo/dtinfo/src/Agents/NodeWindowAgentMotif.C

@@ -209,6 +209,12 @@ xList<UAS_Pointer<UAS_Common> > g_tab_list;
 
 extern AppPrintData * l_AppPrintData; 
 
+extern "C"
+{
+  typedef void (*resize_cb_ptr)();
+  typedef void (*hypertext_cb_ptr)();
+}
+
 #ifdef CV_HYPER_DEBUG
 void
 #else
@@ -1753,8 +1759,8 @@ NodeWindowAgent::create_ui()
 			     FALSE,		// traversal flag
 			     1,			// rows
 			     1,			// columns
-			     (void(*)()) hypertext_cb, // hypertext cb
-			     (void(*)())resize_cb,     // resize cb
+			     (hypertext_cb_ptr) hypertext_cb, // hypertext cb
+			     (resize_cb_ptr) resize_cb,       // resize cb
 			     0,			// exec ok routine
 			     this,		// client_data
 			     defaultList	// default font list

cde/programs/dtinfo/dtinfo/src/Basic/FolioObject.C

@@ -176,7 +176,7 @@ FolioObject::notify (u_int notify_type, void *notify_data)
 // /////////////////////////////////////////////////////////////////
 
 void
-#if defined(SC3) || defined(__osf__) || defined(USL)
+#if defined(SC3) || defined(__osf__) || defined(USL) || defined(__SunOS)
 FolioObject::add_dependent (FolioObject *dependent, notify_handler_t handler,
 #else
 FolioObject::add_dependent (void *dependent, notify_handler_t handler,
@@ -184,7 +184,7 @@ FolioObject::add_dependent (void *dependent, notify_handler_t handler,
 			    u_int notify_type, void *dependent_data)
 {
   // Adds to begining because that's easiest.
-#if defined(SC3) || defined(__osf__) || defined(USL)
+#if defined(SC3) || defined(__osf__) || defined(USL) || defined(__SunOS)
   f_dependents = new Dependent (&f_dependents, f_dependents,
 				dependent, NULL, handler,
 				notify_type, dependent_data);
@@ -206,7 +206,7 @@ FolioObject::add_dependent (void *dependent, notify_handler_t handler,
   // by mistake like this.  We'll just have to cast it to a FolioObject
   // when the call through it is made and hope the compiler doesn't
   // expect it to point to an actual FolioObject (or whatever, eg: WWL). 
-#if defined(SC3) || defined(__osf__) || defined(USL)
+#if defined(SC3) || defined(__osf__) || defined(USL) || defined(__SunOS)
   ON_DEBUG(printf ("@@@ adding to depend_on_list of %p\n", dependent));
   dependent->f_depend_on_list =
     new DependOnList (dependent->f_depend_on_list, f_dependents);
@@ -244,7 +244,7 @@ FolioObject::remove_depend_on (FolioObject *target, Dependent *d)
 // /////////////////////////////////////////////////////////////////
 
 void
-#if defined(SC3) || defined(__osf__) || defined(USL)
+#if defined(SC3) || defined(__osf__) || defined(USL) || defined(__SunOS)
 FolioObject::remove_dependent (FolioObject *dependent,
 #else
 FolioObject::remove_dependent (void *dependent,
@@ -258,7 +258,7 @@ FolioObject::remove_dependent (void *dependent,
   // That means that each handler added must be removed!
   for (d = &f_dependents; *d != NULL; d = &((*d)->f_next))
     {
-#if defined(SC3) || defined(__osf__) || defined(USL)
+#if defined(SC3) || defined(__osf__) || defined(USL) || defined(__SunOS)
       if ((*d)->f_dependent      == dependent   &&
 #else
       if ((*d)->f_dependent      == (FolioObject*)dependent   &&
@@ -272,7 +272,7 @@ FolioObject::remove_dependent (void *dependent,
 	  // f_folio_object will be NULL if the Dependent object was
 	  // created in add_dependent!  DJB 11/10/92 
 	  assert ((*d)->f_folio_object != NULL);
-#if defined(SC3) || defined(__osf__) || defined(USL)
+#if defined(SC3) || defined(__osf__) || defined(USL) || defined(__SunOS)
 	  remove_depend_on (dependent, *d);
 #else
 	  remove_depend_on ((FolioObject*)dependent, *d);
@@ -342,7 +342,7 @@ FolioObject::release_depend_on_list()
 // by deleting that handle!!! 
 
 void
-#if defined(SC3) || defined(__osf__) || defined(USL)
+#if defined(SC3) || defined(__osf__) || defined(USL) || defined(__SunOS)
 FolioObject::observe (FolioObject *real_this, FolioObject *target,
 #else
 FolioObject::observe (void *real_this, FolioObject *target,
@@ -358,7 +358,7 @@ FolioObject::observe (void *real_this, FolioObject *target,
   // ---
   // OK, instead we will have to pass in the "real" this pointer which
   // may be different from the this pointer visible in this routine. 
-#if defined(SC3) || defined(__osf__) || defined(USL)
+#if defined(SC3) || defined(__osf__) || defined(USL) || defined(__SunOS)
   target->f_dependents =
     new Dependent (&target->f_dependents, target->f_dependents,
 		   real_this, this,

cde/programs/dtinfo/dtinfo/src/Basic/FolioObject.hh

@@ -72,7 +72,7 @@ public: // functions
 #define AddDependentd(CB, TYPE, DATA) \
   add_dependent (this, (notify_handler_t)CB, TYPE, DATA)
 
-#if defined(SC3) || defined(__osf__) || defined(USL)
+#if defined(SC3) || defined(__osf__) || defined(USL) || defined(__SunOS)
   void add_dependent (FolioObject *dependent, notify_handler_t handler,
 		      u_int notify_type, void *dependent_data = NULL);
 #else
@@ -85,7 +85,7 @@ public: // functions
 #define RemoveDependentd(CB, TYPE, DATA) \
   remove_dependent(this, (notify_handler_t)CB, TYPE, DATA)
 
-#if defined(SC3) || defined(__osf__) || defined(USL)
+#if defined(SC3) || defined(__osf__) || defined(USL) || defined(__SunOS)
   void remove_dependent (FolioObject *dependent, notify_handler_t handler,
 			 u_int notify_type, void *dependent_data = NULL);
 #else
@@ -101,7 +101,7 @@ public: // functions
 #define Observed(TARG, TYPE, CB, DATA) \
   observe (this, TARG, (notify_handler_t) CB, TYPE, DATA)
 
-#if defined(SC3) || defined(__osf__) || defined(USL)
+#if defined(SC3) || defined(__osf__) || defined(USL) || defined(__SunOS)
   void observe (FolioObject *real_this, FolioObject *target,
 		notify_handler_t callback, u_int notify_type,
 		void *client_data = NULL);

cde/programs/dtinfo/dtinfo/src/Basic/HashTbl.C

@@ -56,6 +56,7 @@ public: // functions
     // NOTE: remove 3rd param after testing
     : List (10, 10, List::GROW_ADD) { };
   int find (FolioObject &);
+  using List::remove;
   void remove (FolioObject &);
 };
 

cde/programs/dtinfo/dtinfo/src/Basic/Imakefile

@@ -1,6 +1,6 @@
 XCOMM $XConsortium: Imakefile /main/6 1996/08/21 15:41:35 drk $
 
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
+DEPEND_DEFINES = $(DEPENDDEFINES)
 CXXEXTRA_DEFINES = -DEXPAND_TEMPLATES
 
 MAKEFILEDEPS=Classlist.mk
@@ -10,9 +10,9 @@ LIBNAME=Basic
 NormalCplusplusObjectRule()
 
 #if defined(UseWideChars) && defined(SunArchitecture) && (OSMajorVersion == 4)
-INCLUDES=$(BROWSER_INCLUDES) $(MMDB_INCLUDES) -I/VOB/olias/library/Xwchar/src -I/VOB/olias/library/binstall/include
+INCLUDES=$(CXXDEPENDINCLUDES) $(BROWSER_INCLUDES) $(MMDB_INCLUDES) -I/VOB/olias/library/Xwchar/src -I/VOB/olias/library/binstall/include
 #else
-INCLUDES=$(BROWSER_INCLUDES) $(COMMON_CLASS_INCLUDES) -I/VOB/olias/library/binstall/include
+INCLUDES=$(CXXDEPENDINCLUDES) $(BROWSER_INCLUDES) $(COMMON_CLASS_INCLUDES) -I/VOB/olias/library/binstall/include
 #endif
 
 #include "Classlist.mk"

cde/programs/dtinfo/dtinfo/src/Graphics/Imakefile

@@ -1,6 +1,6 @@
 XCOMM $XConsortium: Imakefile /main/5 1996/08/21 15:41:55 drk $
 
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
+DEPEND_DEFINES = $(DEPENDDEFINES)
 CXXEXTRA_DEFINES = -DEXPAND_TEMPLATES
 
 MAKEFILEDEPS=Classlist.mk
@@ -9,7 +9,7 @@ LIBNAME=Graphics
 
 NormalCplusplusObjectRule()
 
-INCLUDES=$(BROWSER_INCLUDES) $(MMDB_INCLUDES)
+INCLUDES=$(CXXDEPENDINCLUDES) $(BROWSER_INCLUDES) $(MMDB_INCLUDES)
 
 #ifdef DoLicenseManagement
 EXTRA_DEFINES=-DLICENSE_MANAGEMENT

cde/programs/dtinfo/dtinfo/src/Imakefile

@@ -1,6 +1,6 @@
 XCOMM $TOG: Imakefile /main/48 1998/08/10 15:52:48 mgreess $
 
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
+DEPEND_DEFINES = $(DEPENDDEFINES)
 CXXEXTRA_DEFINES = -DEXPAND_TEMPLATES
 
 PROGRAM_NAME=dtinfo
@@ -50,7 +50,7 @@ SYS_LIBRARIES=-lm -L$(XPROJECTROOT)/lib -L$(MPROJECTROOT)/lib
 SYS_LIBRARIES=-lm
 #endif
 
-INCLUDES = -I. $(BROWSER_INCLUDES) $(MMDB_INCLUDES)
+INCLUDES = $(CXXDEPENDINCLUDES) -I. $(BROWSER_INCLUDES) $(MMDB_INCLUDES)
 
 OLIASNORMALLIBS= \
            Agents/libAgents.a \
@@ -67,7 +67,7 @@ OLIASNORMALLIBS= \
            OliasSearch/libOliasSearch.a \
            Widgets/libWidgets.a \
 	   cgm/libcgm.a
-#if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 3
+#if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 5
 OLIASTLIBS= \
 	   Agents/libAgentsT.a \
 	   Basic/libBasicT.a \
@@ -89,7 +89,7 @@ DLLIB=-ldl
 
 OTHEROBJS=Support/InputNotifier.o
 
-#if defined(SunArchitecture) && (CplusplusCompilerMajorVersion > 3)
+#if defined(SunArchitecture) && (CplusplusCompilerMajorVersion > 5)
   MMDBTEMPLATES=$(OLIAS)/mmdb/libMMDBTemplates.a
   UAS_TEMPLATES=UAS/Base/libBaseT.a \
                 UAS/DtSR/libDtSRT.a \
@@ -257,7 +257,7 @@ DTI_CC_OBJS = \
 	$(MMDB_DIR)/dti_cc/CC_String.o		$(MMDB_DIR)/dti_cc/CC_Tokenizer.o \
 	$(MMDB_DIR)/dti_cc/CC_Stack.o		$(MMDB_DIR)/dti_cc/CC_Slist.o
 
-#if defined(HPArchitecture) || !defined(CplusplusCompilerMajorVersion) || (CplusplusCompilerMajorVersion != 4)
+#if defined(HPArchitecture) || !defined(CplusplusCompilerMajorVersion) || (CplusplusCompilerMajorVersion < 4)
 EXTRA_HARDCOPY_OBJS = $(MMDB_DIR)/HardCopy/TemplatesAutoNumber.o
 #endif
 
@@ -266,7 +266,7 @@ HARDCOPY_OBJS = \
 	$(MMDB_DIR)/HardCopy/autoNumber.o		$(MMDB_DIR)/HardCopy/autoNumberFP.o \
 	$(EXTRA_HARDCOPY_OBJS)
 
-#if defined(HPArchitecture) || !defined(CplusplusCompilerMajorVersion) || (CplusplusCompilerMajorVersion != 4)
+#if defined(HPArchitecture) || !defined(CplusplusCompilerMajorVersion) || (CplusplusCompilerMajorVersion < 4)
 EXTRA_STYLESHEET_OBJS = $(MMDB_DIR)/StyleSheet/SSTemplates.o
 #endif
 
@@ -313,7 +313,10 @@ all:: Prelude.h dfiles messages Dtinfo
 
 includes:: Prelude.h dfiles messages
 
-#if defined(HPArchitecture) ||defined (AIXArchitecture) || defined(UXPArchitecture) || (defined(SunArchitecture) && CplusplusCompilerMajorVersion < 4) || defined(AlphaArchitecture) || defined(USLArchitecture) || defined(BSDArchitecture)
+#if defined(HPArchitecture) ||defined (AIXArchitecture) || \
+    defined(UXPArchitecture) || defined(AlphaArchitecture) || \
+    (defined(SunArchitecture) && CplusplusCompilerMajorVersion < 6) || \
+    defined(USLArchitecture) || defined(BSDArchitecture)
 # ifndef Dont_Use_Templates_Repository
 #  define Dont_Use_Templates_Repository
 UAS_INCLUDES=-I./UAS/Base
@@ -338,7 +341,8 @@ SpecialCPlusPlusObjectRule(Templates.o,,-ptf $(SUBDIR_TEMPL_INCLUDES))
 SpecialCPlusPlusExpandRule(Templates..c,,-ptf -DMakeOperatorNewPublic)
 #elif defined(DoLicenseManagement)
 SpecialCPlusPlusObjectRule(Templates.o,,-ptf $(LICENSE_L_INCLUDES))
-#elif defined(LinuxArchitecture) || defined(BSDArchitecture)
+#elif defined(LinuxArchitecture) || defined(BSDArchitecture) || \
+      defined(SunArchitecture)
 SpecialCPlusPlusObjectRule(Templates.o,,$(SUBDIR_TEMPL_INCLUDES))
 SpecialCPlusPlusExpandRule(Templates..c,,-DMakeOperatorNewPublic)
 #else
@@ -358,7 +362,7 @@ makelib(Preferences)
 makelibT(Managers)
 makelib(Other)
 makelibT(Agents)
-#if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 3
+#if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 5
 makelibsubsubdir(UAS,Base)
 makelibsubsubdir(UAS,DtSR)
 makelibsubsubdir(UAS,MMDB)
@@ -370,7 +374,7 @@ makelibT(Marks)
 makelibT(OnlineRender)
 makelibT(OliasSearch)
 makelib(cgm)
-#if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 3
+#if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 5
 makelibTsubsubdir(UAS,Base)
 makelibTsubsubdir(UAS,DtSR)
 makelibTsubsubdir(UAS,MMDB)

cde/programs/dtinfo/dtinfo/src/Managers/Imakefile

@@ -1,7 +1,7 @@
 XCOMM $XConsortium: Imakefile /main/9 1996/08/21 15:42:26 drk $
 
 XCOMM NodeMgr.o and PrintMgr.o need STYLE_SHEET_INCLUDES.
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES) $(STYLE_SHEET_INCLUDES)
+DEPEND_DEFINES = $(DEPENDDEFINES) $(STYLE_SHEET_INCLUDES)
 CXXEXTRA_DEFINES = -DEXPAND_TEMPLATES
 
 DEFINES=-DCDE_NEXT $(BYTE_ORDER_DEFINES)
@@ -23,7 +23,7 @@ LIBNAME=Managers
 
 NormalCplusplusObjectRule()
 
-INCLUDES=$(BROWSER_INCLUDES) $(COMMON_CLASS_INCLUDES)
+INCLUDES=$(CXXDEPENDINCLUDES) $(BROWSER_INCLUDES) $(COMMON_CLASS_INCLUDES)
 
 #include "Classlist.mk"
 

cde/programs/dtinfo/dtinfo/src/Marks/Imakefile

@@ -1,6 +1,6 @@
 XCOMM $XConsortium: Imakefile /main/6 1996/08/21 15:42:50 drk $
 
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
+DEPEND_DEFINES = $(DEPENDDEFINES)
 CXXEXTRA_DEFINES = -DEXPAND_TEMPLATES
 
 NormalCplusplusObjectRule()
@@ -10,7 +10,7 @@ MAKEFILEDEPS=Classlist.mk
 LIBNAME=Marks
 
 
-INCLUDES=-I.. $(EXCEPTIONS_INCLUDES) $(MMDB_INCLUDES) $(UAS_INCLUDES)
+INCLUDES=$(CXXDEPENDINCLUDES) -I.. $(EXCEPTIONS_INCLUDES) $(MMDB_INCLUDES) $(UAS_INCLUDES)
 DEFINES=$(BYTE_ORDER_DEFINES)
 
 #include "Classlist.mk"

cde/programs/dtinfo/dtinfo/src/OliasSearch/Imakefile

@@ -1,5 +1,6 @@
 XCOMM $XConsortium: Imakefile /main/4 1996/08/21 15:42:57 drk $
 
+DEPEND_DEFINES = $(DEPENDDEFINES)
 CXXEXTRA_DEFINES = -DEXPAND_TEMPLATES
 
 MAKEFILEDEPS=Classlist.mk
@@ -7,7 +8,7 @@ LIBNAME=OliasSearch
 
 NormalCplusplusObjectRule()
 
-INCLUDES=$(BROWSER_INCLUDES)
+INCLUDES=$(CXXDEPENDINCLUDES) $(BROWSER_INCLUDES)
 
 #include "Classlist.mk"
 

cde/programs/dtinfo/dtinfo/src/OnlineRender/Imakefile

@@ -1,13 +1,13 @@
 XCOMM $XConsortium: Imakefile /main/8 1996/08/21 15:43:09 drk $
 
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
+DEPEND_DEFINES = $(DEPENDDEFINES)
 CXXEXTRA_DEFINES = -DEXPAND_TEMPLATES
 
 LIBNAME=OnlineRender
 
 NormalCplusplusObjectRule()
 
-INCLUDES=$(BROWSER_INCLUDES) $(MMDB_INCLUDES) $(STYLE_SHEET_INCLUDES) \
+INCLUDES=$(CXXDEPENDINCLUDES) $(BROWSER_INCLUDES) $(MMDB_INCLUDES) $(STYLE_SHEET_INCLUDES) \
 $(COMMON_CLASS_INCLUDES) 
 DEFINES=-DCDE_NEXT
 

cde/programs/dtinfo/dtinfo/src/Other/Imakefile

@@ -1,6 +1,6 @@
 XCOMM $XConsortium: Imakefile /main/8 1996/08/21 15:43:18 drk $
 
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
+DEPEND_DEFINES = $(DEPENDDEFINES)
 
 CDEBUGFLAGS=-g
 
@@ -10,7 +10,7 @@ LIBNAME=Other
 
 NormalCplusplusObjectRule()
 
-INCLUDES = $(BROWSER_INCLUDES)
+INCLUDES = $(CXXDEPENDINCLUDES) $(BROWSER_INCLUDES)
 
 #include "Classlist.mk"
 

cde/programs/dtinfo/dtinfo/src/Other/WindowSystemMotif.C

@@ -206,15 +206,15 @@ NULL
 
 
 static XtActionsRec DrawnBActions[] =
-    {
-        {(char*)"DeSelectAll"    , _DtHelpDeSelectAll    },
-        {(char*)"SelectAll"      , _DtHelpSelectAll      },
-        {(char*)"ActivateLink"   , _DtHelpActivateLink   },
-        {(char*)"CopyToClipboard", _DtHelpCopyAction     },
-        {(char*)"PageUpOrDown"   , _DtHelpPageUpOrDown   },
-        {(char*)"PageLeftOrRight", _DtHelpPageLeftOrRight},
-        {(char*)"NextLink"       , _DtHelpNextLink       }
-    };
+  {
+    {(char*)"DeSelectAll"    , (DeSelectAll_ptr)_DtHelpDeSelectAll         },
+    {(char*)"SelectAll"      , (SelectAll_ptr)_DtHelpSelectAll             },
+    {(char*)"ActivateLink"   , (ActivateLink_ptr)_DtHelpActivateLink       },
+    {(char*)"CopyToClipboard", (CopyAction_ptr)_DtHelpCopyAction           },
+    {(char*)"PageUpOrDown"   , (PageUpOrDown_ptr)_DtHelpPageUpOrDown       },
+    {(char*)"PageLeftOrRight", (PageLeftOrRight_ptr)_DtHelpPageLeftOrRight },
+    {(char*)"NextLink"       , (NextLink_ptr)_DtHelpNextLink               }
+  };
 
 
 
@@ -268,10 +268,11 @@ WindowSystem::WindowSystem (int &argc, char *argv[])
   bool debugging = get_boolean_app_resource("debug");
   if (!debugging)
     {
-      signal (SIGABRT, /*DWC IBM (SIG_PF)*/ core_dump_handler);
-      signal (SIGBUS, /*(SIG_PF)*/ core_dump_handler);
-      signal (SIGSEGV, /*(SIG_PF)*/ core_dump_handler);
-      signal (SIGINT, interrupt_handler);
+      signal (SIGABRT,
+              /*DWC IBM (SIG_PF)*/ (core_dump_handler_ptr)core_dump_handler);
+      signal (SIGBUS, /*(SIG_PF)*/ (core_dump_handler_ptr)core_dump_handler);
+      signal (SIGSEGV, /*(SIG_PF)*/ (core_dump_handler_ptr)core_dump_handler);
+      signal (SIGINT, (interrupt_handler_ptr)interrupt_handler);
     }
 
   /* Reference the scale widget so Veritas Replay Xt lib can link. */
@@ -553,7 +554,7 @@ WindowSystem::init()
   XSynchronize(f_display, True);
 #endif
   XSync(f_display, False);
-  XSetErrorHandler(xevent_error_aborter);
+  XSetErrorHandler((xevent_error_aborter_ptr)xevent_error_aborter);
 
 #if 0
   XtAppSetFallbackResources(f_application_context, fallbacks);
@@ -620,7 +621,8 @@ WindowSystem::init()
 	      parentCvtArg, XtNumber (parentCvtArg), XtCacheNone, NULL);
 #endif /* XmVersion < 1002 */
 
-  XtAddConverter (XtRString, XtRGravity, XmuCvtStringToGravity, NULL, 0);
+  XtAddConverter (XtRString, XtRGravity,
+                  (XmuCvtStringToGravity_ptr)XmuCvtStringToGravity, NULL, 0);
 
 #if XmVersion >= 1002
   XmRepTypeInstallTearOffModelConverter();
@@ -1592,6 +1594,6 @@ WindowSystem::interrupt_handler (int /* signal_number */)
   }
 
 #if defined(SVR4) || defined(hpux) || defined(_IBMR2)
-  signal (SIGINT, interrupt_handler);
+  signal (SIGINT, (interrupt_handler_ptr)interrupt_handler);
 #endif
 }

cde/programs/dtinfo/dtinfo/src/Other/WindowSystemMotif.hh

@@ -41,6 +41,33 @@ typedef struct _VideoShell
     Boolean silent;
 } VideoShell;
 
+typedef void _DtHelpDeSelectAll_t(_WidgetRec*,_XEvent*,char**,unsigned*);
+typedef _DtHelpDeSelectAll_t * DeSelectAll_ptr;
+typedef void _DtHelpSelectAll_t(_WidgetRec*,_XEvent*,char**,unsigned*);
+typedef _DtHelpSelectAll_t * SelectAll_ptr;
+typedef void _DtHelpActivateLink_t(_WidgetRec*,_XEvent*,char**,unsigned*);
+typedef _DtHelpActivateLink_t * ActivateLink_ptr;
+typedef void _DtHelpCopyAction_t(_WidgetRec*,_XEvent*,char**,unsigned*);
+typedef _DtHelpCopyAction_t * CopyAction_ptr;
+typedef void _DtHelpPageUpOrDown_t(_WidgetRec*,_XEvent*,char**,unsigned*);
+typedef _DtHelpPageUpOrDown_t * PageUpOrDown_ptr;
+typedef void _DtHelpPageLeftOrRight_t(_WidgetRec*,_XEvent*,char**,unsigned*);
+typedef _DtHelpPageLeftOrRight_t * PageLeftOrRight_ptr;
+typedef void _DtHelpNextLink_t(_WidgetRec*,_XEvent*,char**,unsigned*);
+typedef _DtHelpNextLink_t * NextLink_ptr;
+typedef void XmuCvtStringToGravity_t(XrmValue*,unsigned*,XrmValue*,XrmValue*);
+typedef XmuCvtStringToGravity_t * XmuCvtStringToGravity_ptr;
+
+extern "C"
+{
+  typedef void core_dump_handler_t(int signal_number);
+  typedef core_dump_handler_t * core_dump_handler_ptr;
+  typedef void interrupt_handler_t(int signal_number);
+  typedef interrupt_handler_t * interrupt_handler_ptr;
+  typedef int xevent_error_aborter_t(Display *display,XErrorEvent* error_event);
+  typedef xevent_error_aborter_t * xevent_error_aborter_ptr;
+}
+
 class WindowGeometry;
 
 class WindowSystem : public WWL, public FolioObject

cde/programs/dtinfo/dtinfo/src/Preferences/Imakefile

@@ -1,7 +1,7 @@
 XCOMM $XConsortium: Imakefile /main/6 1996/08/21 15:43:25 drk $
 
 #define CplusplusSource	YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
+DEPEND_DEFINES = $(DEPENDDEFINES)
 
 MAKEFILEDEPS=Classlist.mk
 
@@ -9,7 +9,7 @@ LIBNAME=Preferences
 
 NormalCplusplusObjectRule()
 
-INCLUDES=$(BROWSER_INCLUDES)
+INCLUDES=$(CXXDEPENDINCLUDES) $(BROWSER_INCLUDES)
 
 
 #include "Classlist.mk"
@@ -18,7 +18,9 @@ OBJS=$(SRCS:.C=.o)
 
 make_libfiles($(LIBNAME), $(CLASSES))
 
-#if defined(LinuxArchitecture) || defined(BSDArchitecture)
+#if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 3
+SimpleLibraryT($(LIBNAME), $(OBJS), $(LIBDIR))
+#elif defined(LinuxArchitecture) || defined(BSDArchitecture)
 SimpleLibrary($(LIBNAME), $(OBJS), $(LIBDIR))
 #else
 SimpleLibrary($(LIBNAME), $(OBJS), $(LIBDIR))

cde/programs/dtinfo/dtinfo/src/Preferences/UserPreference.C

@@ -63,7 +63,8 @@
 #include <ctype.h>
 #include <stdio.h>
 #include <unistd.h>
-#if !defined(hpux) && !defined(__osf__) && !defined(USL) && !defined(linux) && !defined(CSRG_BASED)
+#if !defined(hpux) && !defined(__osf__) && !defined(USL) && \
+    !defined(linux) && !defined(CSRG_BASED) && !defined(sun)
 #include <sysent.h>
 #endif
 #include <sys/types.h>

cde/programs/dtinfo/dtinfo/src/Query/Imakefile

@@ -1,6 +1,6 @@
 XCOMM $XConsortium: Imakefile /main/7 1996/08/21 15:43:32 drk $
 
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
+DEPEND_DEFINES = $(DEPENDDEFINES)
 CXXEXTRA_DEFINES = -DEXPAND_TEMPLATES
 
 MAKEFILEDEPS=Classlist.mk
@@ -9,7 +9,7 @@ LIBNAME=Query
 
 NormalCplusplusObjectRule()
 
-INCLUDES=$(BROWSER_INCLUDES) $(COMMON_CLASS_INCLUDES)
+INCLUDES=$(CXXDEPENDINCLUDES) $(BROWSER_INCLUDES) $(COMMON_CLASS_INCLUDES)
 
 #include "Classlist.mk"