OpenIndiana and Solaris port

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;