Remove Unixware and openserver support

2018-05-19 19:50:35 -05:00
parent beea573d17
commit 07900bd93b
375 changed files with 725 additions and 9112 deletions
--- a/cde/programs/dtinfo/DtMmdb/HardCopy/TemplatesAutoNumber.C
+++ b/cde/programs/dtinfo/DtMmdb/HardCopy/TemplatesAutoNumber.C
@@ -35,7 +35,7 @@

 #endif /* end of CDE_NEXT */

-#if defined(sun) || defined(hpux) || defined(USL)
+#if defined(sun) || defined(hpux)

 #ifndef CDE_NEXT /* { */

@@ -118,31 +118,3 @@ CC_Boolean kv_pair<CC_String, autoNumberListT>::f_needRemove = FALSE;
 CC_Boolean kv_pair<CC_String, autoNumber>::f_needRemove = FALSE; 

 #endif
-
-#ifdef USL
-
-#pragma instantiate hashTable<CC_String,autoNumberListT>
-#pragma instantiate hashTable<CC_String,autoNumber>
-
-#ifndef CDE_NEXT
-#pragma instantiate CC_TPtrSlistDictionary<CC_String,autoNumberListT>
-#pragma instantiate CC_TPtrSlistDictionary<CC_String,autoNumber>
-#endif
-
-#pragma instantiate CC_TPtrSlist<autoNumber>
- 
-#pragma instantiate hashTableIterator<CC_String,autoNumber>
-#pragma instantiate hashTableIterator<CC_String,autoNumberListT> 
-
-#pragma instantiate Stack<int>
-
-// still unresolved
-
-#pragma instantiate CC_TPtrSlist<kv_pair<CC_String, autoNumberListT> >
-#pragma instantiate kv_pair<CC_String, autoNumber>
-#pragma instantiate kv_pair<CC_String, autoNumberListT>
-#pragma instantiate CC_TPtrSlist<kv_pair<CC_String, autoNumber> >
-#pragma instantiate pointer_vector<CC_TPtrSlist<kv_pair<CC_String, autoNumber> > >
-#pragma instantiate pointer_vector<CC_TPtrSlist<kv_pair<CC_String, autoNumberListT> > >
-
-#endif
--- a/cde/programs/dtinfo/DtMmdb/StyleSheet/DocParser.C
+++ b/cde/programs/dtinfo/DtMmdb/StyleSheet/DocParser.C
@@ -245,7 +245,6 @@ DocParser::process(istream &input, ostringstream &output,
 #if !defined(SC3) && \
    !defined(__osf__) && \
    !defined(_IBMR2) && \
-    !defined(USL) && \
    !defined(linux) && \
    !defined(CSRG_BASED) && \
    !defined(sun)
@@ -255,7 +254,6 @@ DocParser::process(istream &input, ostringstream &output,
 #if !defined(SC3) &&  \
    !defined(__osf__) && \
    !defined(_IBMR2) && \
-    !defined(USL) && \
    !defined(linux) && \
    !defined(CSRG_BASED) && \
    !defined(sun)
--- a/cde/programs/dtinfo/DtMmdb/StyleSheet/Expression.C
+++ b/cde/programs/dtinfo/DtMmdb/StyleSheet/Expression.C
@@ -142,19 +142,19 @@ BinaryOperatorNode::evaluate() const
  // calculate children trees and then have feature value do the operation 

 #if !defined(SC3) && !defined(_IBMR2) && \
-    !defined(__osf__) && !defined(USL) && !defined(linux) && \
+    !defined(__osf__) && !defined(linux) && \
    !defined(CSRG_BASED) && !defined(sun)
  volatile
 #endif
  FeatureValue *left =  0;
 #if !defined(SC3) && !defined(_IBMR2) && \
-    !defined(__osf__) && !defined(USL) && !defined(linux) && \
+    !defined(__osf__) && !defined(linux) && \
    !defined(CSRG_BASED) && !defined(sun)
  volatile
 #endif
  FeatureValue *right = 0;
 #if !defined(SC3) && !defined(_IBMR2) && \
-    !defined(__osf__) && !defined(USL) && !defined(linux) && \
+    !defined(__osf__) && !defined(linux) && \
    !defined(CSRG_BASED) && !defined(sun)
  volatile
 #endif
--- a/cde/programs/dtinfo/DtMmdb/StyleSheet/SSTemplates.C
+++ b/cde/programs/dtinfo/DtMmdb/StyleSheet/SSTemplates.C
@@ -69,7 +69,7 @@ typedef Stack<FeatureSet*,dlist_array<FeatureSet> > _stack_fs_orvec_fs_;
 // the largest ID used in f's: 59
 //

-#if defined(sun) || defined(hpux) || defined (USL)
+#if defined(sun) || defined(hpux)
 typedef CC_TPtrSlist<Attribute> _f4_;
 typedef CC_TPtrSlist<Feature>   _f5_;
 typedef CC_TPtrSlist<PathFeature> _f2_;
@@ -232,76 +232,3 @@ typedef pointer_vector<FeatureValue> _pointer_vector_FeatureValue_;
 #pragma define_template kv_pair<FeatureDef, FeatureDef>
 #pragma define_template CC_TPtrSlist<PathTerm>
 #endif
-
-#ifdef USL
-
-#pragma instantiate CC_TPtrSlist<CC_String> 
-#pragma instantiate CC_TPtrDlist<CC_String> 
-
-#pragma instantiate CC_TPtrSlist<Attribute> 
-#pragma instantiate CC_TPtrSlist<Feature>   
-#pragma instantiate CC_TPtrSlist<PathFeature> 
-#pragma instantiate CC_TPtrSlist<FeatureValue> 
-#pragma instantiate CC_TPtrSlist<FeatureDef> 
-#pragma instantiate CC_TPtrSlist<TypeValues> 
-#pragma instantiate CC_TPtrSlist<char> 
-
-#pragma instantiate CC_TPtrDlist<PathFeature> 
-#pragma instantiate CC_TPtrDlist<Symbol>    
-#pragma instantiate CC_TPtrDlist<ResolverStackElement> 
-#pragma instantiate CC_TPtrDlist<char>    
-
-#pragma instantiate hashTable<SymbolName, unsigned int> 
-#pragma instantiate hashTable<Symbol, Expression> 
-#pragma instantiate hashTable<unsigned int,BitVector> 
-
-#pragma instantiate hashTableIterator<SymbolName,unsigned int> 
-#pragma instantiate hashTableIterator<unsigned int,BitVector> 
-#pragma instantiate hashTableIterator<Symbol, Expression> 
-#pragma instantiate hashTableIterator<FeatureDef, FeatureDef> 
-
-
-#ifndef CDE_NEXT
-#pragma instantiate CC_TPtrSlistDictionary<SymbolName,unsigned int> 
-#pragma instantiate CC_TPtrSlistDictionary<unsigned int,BitVector> 
-#pragma instantiate CC_TPtrSlistDictionary<Symbol,Expression> 
-#pragma instantiate CC_TPtrSlistDictionary<SymbolName,unsigned int> 
-#endif
-
-typedef dlist_array<CC_String> _ordvec_cstring_ ;
-typedef CC_TValSlist<posRecord> _f54_;
-typedef value_vector<PathTermPtr> _PathTermPtrvalue_vector_;
-typedef pointer_vector<FeatureValue> _pointer_vector_FeatureValue_;
-
-#pragma instantiate dlist_array<CC_String> 
-#pragma instantiate CC_TValSlist<posRecord> 
-#pragma instantiate value_vector<PathTermPtr> 
-#pragma instantiate pointer_vector<FeatureValue> 
-
-// unresolved references
-
-#pragma instantiate CC_TPtrDlist<PathTerm> 
-#pragma instantiate CC_TPtrDlistIterator<PathTerm>
-#pragma instantiate CC_TValSlistIterator<posRecord>
-#pragma instantiate CC_TPtrSlist<Symbol>
-#pragma instantiate dlist_array<Symbol>
-#pragma instantiate CC_TPtrSlist<ResolverStackElement>
-#pragma instantiate kv_pair<SymbolName, unsigned int>
-#pragma instantiate CC_TPtrSlist<kv_pair<SymbolName, unsigned int> >
-#pragma instantiate pointer_vector<CC_TPtrSlist<kv_pair<SymbolName, unsigned int> > >
-#pragma instantiate CC_TPtrSlist<kv_pair<unsigned int, BitVector> >
-#pragma instantiate pointer_vector<CC_TPtrSlist<kv_pair<unsigned int, BitVector> > >
-#pragma instantiate CC_TPtrSlist<Symbol>
-#pragma instantiate kv_pair<Symbol, Expression>
-#pragma instantiate CC_TPtrSlist<kv_pair<Symbol, Expression> >
-#pragma instantiate pointer_vector<CC_TPtrSlist<kv_pair<Symbol, Expression> > >
-#pragma instantiate CC_TPtrSlist<kv_pair<FeatureDef, FeatureDef> >
-#pragma instantiate pointer_vector<CC_TPtrSlist<kv_pair<FeatureDef, FeatureDef> > > 
-#pragma instantiate CC_TValSlist<int>
-#pragma instantiate CC_TValSlistIterator<int>
-#pragma instantiate CC_TValSlistIterator<char>
-
-#pragma instantiate kv_pair<unsigned int, BitVector>
-#pragma instantiate kv_pair<FeatureDef, FeatureDef>
-#pragma instantiate CC_TPtrSlist<PathTerm>
-#endif
--- a/cde/programs/dtinfo/DtMmdb/StyleSheet/defToken.C
+++ b/cde/programs/dtinfo/DtMmdb/StyleSheet/defToken.C
@@ -43,7 +43,7 @@

 #include <stdlib.h>

-#if !defined(__osf__) && !defined(USL) && !defined(linux) && \
+#if !defined(__osf__) && !defined(linux) && \
    !defined(CSRG_BASED) && !defined(sun)
 #include <osfcn.h>
 #endif
--- a/cde/programs/dtinfo/DtMmdb/StyleSheet/tokenStyle.C
+++ b/cde/programs/dtinfo/DtMmdb/StyleSheet/tokenStyle.C
@@ -43,7 +43,7 @@

 #include <stdlib.h>

-#if !defined(__osf__) && !defined(USL) && !defined(linux) && \
+#if !defined(__osf__) && !defined(linux) && \
    !defined(CSRG_BASED) && !defined(sun)
 #include <osfcn.h>
 #endif
--- a/cde/programs/dtinfo/DtMmdb/compression/ps.C
+++ b/cde/programs/dtinfo/DtMmdb/compression/ps.C
@@ -46,10 +46,8 @@
 #if defined(__osf__) || defined(linux) || defined(CSRG_BASED) || defined(sun)
 #include <unistd.h>
 #else
-#if !defined(USL)
 #include <osfcn.h>
 #endif
-#endif

 /* use prototypes in function declarations */
 #define ps_USE_PROTOS
--- a/cde/programs/dtinfo/DtMmdb/compression/sgml.C
+++ b/cde/programs/dtinfo/DtMmdb/compression/sgml.C
@@ -46,10 +46,8 @@
 #if defined(__osf__) || defined(linux) || defined(CSRG_BASED) || defined(sun)
 #include <unistd.h>
 #else
-#if !defined(USL)
 #include <osfcn.h>
 #endif
-#endif

 /* use prototypes in function declarations */
 #define sgml_USE_PROTOS
--- a/cde/programs/dtinfo/DtMmdb/dti_excs/Exception.hh
+++ b/cde/programs/dtinfo/DtMmdb/dti_excs/Exception.hh
@@ -82,10 +82,8 @@ public:
  // Need to provide a plain operator new definition because we
  // have a definition of the other one below.  (See the ARM.) 

-#ifndef USL    
  static void *operator new (size_t size)
    { return (::operator new (size)); }
-#endif

  static void operator delete (void *place);

--- a/cde/programs/dtinfo/DtMmdb/dti_excs/Exceptions.hh
+++ b/cde/programs/dtinfo/DtMmdb/dti_excs/Exceptions.hh
@@ -130,7 +130,7 @@ extern "C" {

 // This works if OBJ is an object or a pointer since Exception objects
 // overload operator ->.
-#if !defined(hpux) && !defined(USL)
+#if !defined(hpux)
 #define mthrow(OBJ) \
  (OBJ)->throw_it (__LINE__, __FILE__, DEBUG_THROW_FLAG)
 #else
--- a/cde/programs/dtinfo/DtMmdb/schema/token.C
+++ b/cde/programs/dtinfo/DtMmdb/schema/token.C
@@ -46,10 +46,8 @@
 #if defined(__osf__) || defined(linux) || defined(CSRG_BASED) || defined(sun)
 #include <unistd.h>
 #else
-#if !defined(USL)
 #include <osfcn.h>
 #endif
-#endif

 /* use prototypes in function declarations */
 #define  schema_USE_PROTOS
--- a/cde/programs/dtinfo/DtMmdb/utility/filebuf.C
+++ b/cde/programs/dtinfo/DtMmdb/utility/filebuf.C
@@ -26,7 +26,7 @@
 #include <sys/types.h>
 #include <unistd.h>

-#if !defined(hpux) && !defined(__osf__) && !defined(USL) && \
+#if !defined(hpux) && !defined(__osf__) && \
    !defined(linux) && !defined(CSRG_BASED) && !defined(sun)
 #include <sysent.h>
 #endif
--- a/cde/programs/dtinfo/DtMmdb/utility/funcs.C
+++ b/cde/programs/dtinfo/DtMmdb/utility/funcs.C
@@ -82,45 +82,6 @@ int getdomainname(char *, int);

 #define BUFLEN 512

-#ifdef USL
-
-int _DtMmdbStrcasecmp(register const char* s1, register const char* s2)
-{
-    register int c1, c2;
-
-    while (*s1 && *s2) {
-	c1 = isupper(*s1) ? tolower(*s1) : *s1;
-	c2 = isupper(*s2) ? tolower(*s2) : *s2;
-	if (c1 != c2)
-	    return (c1 - c2);
-	s1++;
-	s2++;
-    }
-    return (int) (*s1 - *s2);
-}
-
-int _DtMmdbStrncasecmp(register const char* s1,
-		       register const char* s2,
-		       register int count)
-{
-    register int c1, c2;
-
-    if (!count)
-      return 0;
-
-    while (*s1 && *s2) {
-	c1 = isupper(*s1) ? tolower(*s1) : *s1;
-	c2 = isupper(*s2) ? tolower(*s2) : *s2;
-	if ((c1 != c2) || (! --count))
-	    return (c1 - c2);
-	s1++;
-	s2++;
-    }
-    return (int) (*s1 - *s2);
-}
-
-#endif
-
 #ifdef mips
 #include <sys/utsname.h>

--- a/cde/programs/dtinfo/DtMmdb/utility/funcs.h
+++ b/cde/programs/dtinfo/DtMmdb/utility/funcs.h
@@ -52,11 +52,11 @@
 #ifndef _funcs_h
 #define _funcs_h 1

-#if !defined(USL) && !defined(__osf__) && !defined(linux) && \
+#if !defined(__osf__) && !defined(linux) && \
    !defined(CSRG_BASED) && !defined(sun)
 #include <libc.h>
 #endif
-#if defined(hpux) || defined(sgi) || defined(USL) ||defined(__osf__) || \
+#if defined(hpux) || defined(sgi) ||defined(__osf__) || \
    defined(linux) || defined(CSRG_BASED) || defined(sun)
 #include <unistd.h>
 #else
@@ -95,12 +95,6 @@ using namespace std;
 #include "utility/macro.h"
 #include "utility/mmdb_exception.h"

-#ifdef USL
-int _DtMmdbStrcasecmp(const char *s1, const char *s2);
-int _DtMmdbStrncasecmp(const char *s1, const char *s2, int n);
-#define strcasecmp(s1,s2) _DtMmdbStrcasecmp(s1,s2)
-#define strncasecmp(s1,s2,n) _DtMmdbStrncasecmp(s1,s2,n)
-#endif
 #ifdef _IBMR2
 /* no C++ version of <strings.h>, C version causes conflicts */
 extern "C" {
--- a/cde/programs/dtinfo/DtMmdb/utility/streambuf.C
+++ b/cde/programs/dtinfo/DtMmdb/utility/streambuf.C
@@ -23,7 +23,7 @@
 /* $XConsortium: streambuf.C /main/8 1996/08/21 15:55:14 drk $ */
 #include "utility/c_streambuf.h"

-#if defined(USL) || defined(__osf__) || defined(linux) || \
+#if defined(__osf__) || defined(linux) || \
    defined(CSRG_BASED) || defined(sun)
 #include <stdlib.h>
 #else
--- a/cde/programs/dtinfo/DtMmdb/utility/xtime.C
+++ b/cde/programs/dtinfo/DtMmdb/utility/xtime.C
@@ -48,7 +48,7 @@
 #ifdef SVR4
 #include <sys/time.h>

-#if !defined (_IBMR2) && !defined(sun) && !defined(USL)
+#if !defined (_IBMR2) && !defined(sun)
 extern "C" { extern int gettimeofday(struct timeval *tp); }
 #endif

@@ -78,7 +78,7 @@ void xtime::stop(float &cpu_time, long &elp_time)

 void xtime::start()
 {
-#if defined (SVR4) && !defined (_IBMR2) && !defined(sun) && !defined(__osf__) && !defined(USL)
+#if defined (SVR4) && !defined (_IBMR2) && !defined(sun) && !defined(__osf__)
   if ( gettimeofday(&v_tv) != 0 ) {
 #else
   if ( gettimeofday(&v_tv, &v_tz) != 0 ) {