OpenIndiana and Solaris port

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>