Remove Unixware and openserver support

cde/programs/nsgmls/Imakefile

@@ -33,23 +33,6 @@ CXXTEMPLATEFLAGS = -ptf
 M4 = /bin/m4
 #endif
 
-#ifdef SCOArchitecture
-/* put cpp directives here rather than in CXXDEFINES because
- * for some reason the CXXDEFINES aren't passed to the link phase
- * but they are needed there to instantiate templates
- */
-CXXOPTIONS = \
-  -DSP_VOLATILE= -DSP_CONST= \
-  -DSP_HAVE_LOCALE -DSP_MULTI_BYTE -DSP_MANUAL_INST
-
-/*
- * Flags passed into compile step when doing manual template instantiation.
- */
-CXXTEMPLATEFLAGS =
-
-M4 = /bin/m4
-#endif
-
 #ifdef HPArchitecture
 /*
  * make null pointer use invalid
@@ -131,23 +114,6 @@ CXXTEMPLATEFLAGS =
 M4 = /usr/ccs/bin/m4
 #endif /* SunArchitecture */
 
-#if defined(USLArchitecture)
-/* put cpp directives here rather than in CXXDEFINES because
- * for some reason the CXXDEFINES aren't passed to the link phase
- * but they are needed there to instantiate templates
- */
-CXXOPTIONS = \
-  -DSP_VOLATILE= -DSP_CONST= \
-  -DSP_HAVE_LOCALE -DSP_MULTI_BYTE -DSP_MANUAL_INST
-
-/*
- * Flags passed into compile step when doing manual template instantiation.
- */
-CXXTEMPLATEFLAGS =
-
-M4 = /bin/m4
-#endif
-
 .SUFFIXES: .m4
 .m4.C:
 	rm -f $@

cde/programs/nsgmls/Ptr.h

@@ -73,22 +73,15 @@ private:
 };
 
 template<class T>
-#if defined (USL)
-class ConstPtr : public Ptr<T> {
-#else
 class ConstPtr : private Ptr<T> {
-#endif
 public:
   ConstPtr() { }
   ConstPtr(T *ptr) : Ptr<T>(ptr) { }
   ConstPtr(const Ptr<T> &p) : Ptr<T>(p) { }
   ConstPtr(const ConstPtr<T> &p) : Ptr<T>(p) { }
-#if defined (USL)
-#else
   ConstPtr<T> &operator=(const Ptr<T> &p) {
     Ptr<T>::operator=(p); return *this;
   }
-#endif
   ConstPtr<T> &operator=(const ConstPtr<T> &p) {
     Ptr<T>::operator=(p); return *this;
   }

cde/programs/nsgmls/instmac.m4

@@ -21,8 +21,6 @@ define(`__instantiate',`#if defined(__DECCXX)
   #pragma define_template $1
 #elif defined(AIXV3)
   #pragma define($1)
-#elif defined(USL)
-  #pragma instantiate $1
 #elif defined(SP_ANSI_CLASS_INST)
   template class $1;
 #else