Remove UXPDS support

2018-05-15 20:11:08 -05:00
parent 0f8233dadd
commit 8a4f389634
319 changed files with 317 additions and 8776 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(__uxp__)  || defined(USL)
+#if defined(sun) || defined(hpux) || defined(USL)

 #ifndef CDE_NEXT /* { */

--- a/cde/programs/dtinfo/DtMmdb/HardCopy/all_tmpls
+++ b/cde/programs/dtinfo/DtMmdb/HardCopy/all_tmpls
@@ -1,2 +1,2 @@
-// all_tmplts - force instantiation of all templates under UXPDS and HPUX
+// all_tmplts - force instantiation of all templates under HPUX
@all
--- 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(__uxp__) && \
    !defined(USL) && \
    !defined(linux) && \
    !defined(CSRG_BASED) && \
@@ -256,7 +255,6 @@ DocParser::process(istream &input, ostringstream &output,
 #if !defined(SC3) &&  \
    !defined(__osf__) && \
    !defined(_IBMR2) && \
-    !defined(__uxp__) && \
    !defined(USL) && \
    !defined(linux) && \
    !defined(CSRG_BASED) && \
--- a/cde/programs/dtinfo/DtMmdb/StyleSheet/Expression.C
+++ b/cde/programs/dtinfo/DtMmdb/StyleSheet/Expression.C
@@ -141,19 +141,19 @@ BinaryOperatorNode::evaluate() const
 {
  // calculate children trees and then have feature value do the operation 

-#if !defined(SC3) && !defined(_IBMR2) && !defined(__uxp__) && \
+#if !defined(SC3) && !defined(_IBMR2) && \
    !defined(__osf__) && !defined(USL) && !defined(linux) && \
    !defined(CSRG_BASED) && !defined(sun)
  volatile
 #endif
  FeatureValue *left =  0;
-#if !defined(SC3) && !defined(_IBMR2) && !defined(__uxp__) && \
+#if !defined(SC3) && !defined(_IBMR2) && \
    !defined(__osf__) && !defined(USL) && !defined(linux) && \
    !defined(CSRG_BASED) && !defined(sun)
  volatile
 #endif
  FeatureValue *right = 0;
-#if !defined(SC3) && !defined(_IBMR2) && !defined(__uxp__) && \
+#if !defined(SC3) && !defined(_IBMR2) && \
    !defined(__osf__) && !defined(USL) && !defined(linux) && \
    !defined(CSRG_BASED) && !defined(sun)
  volatile
--- a/cde/programs/dtinfo/DtMmdb/StyleSheet/FeatureSet.C
+++ b/cde/programs/dtinfo/DtMmdb/StyleSheet/FeatureSet.C
@@ -81,11 +81,7 @@ FeatureSet::evaluate(FeatureSet *result_set) const
 	  result_set->append(new Feature(next.key()->name(),
 					 value));
 	}
-#ifdef UXPDS
-      mcatch_any()
-#else
      mcatch_noarg(badEvaluationException)
-#endif
 	{
 	  /* do nothing...we just ignore any that will not evaluate */
 	}
--- 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 (__uxp__) || defined (USL)
+#if defined(sun) || defined(hpux) || defined (USL)
 typedef CC_TPtrSlist<Attribute> _f4_;
 typedef CC_TPtrSlist<Feature>   _f5_;
 typedef CC_TPtrSlist<PathFeature> _f2_;
--- a/cde/programs/dtinfo/DtMmdb/StyleSheet/all_tmpls
+++ b/cde/programs/dtinfo/DtMmdb/StyleSheet/all_tmpls
@@ -1,2 +0,0 @@
-// all_tmplts - force instantiation of all templates under UXPDS
-@all
--- a/cde/programs/dtinfo/DtMmdb/compression/ps.C
+++ b/cde/programs/dtinfo/DtMmdb/compression/ps.C
@@ -46,7 +46,7 @@
 #if defined(__osf__) || defined(linux) || defined(CSRG_BASED) || defined(sun)
 #include <unistd.h>
 #else
-#if !defined(__uxp__) && !defined(USL)
+#if !defined(USL)
 #include <osfcn.h>
 #endif
 #endif
--- a/cde/programs/dtinfo/DtMmdb/compression/sgml.C
+++ b/cde/programs/dtinfo/DtMmdb/compression/sgml.C
@@ -46,7 +46,7 @@
 #if defined(__osf__) || defined(linux) || defined(CSRG_BASED) || defined(sun)
 #include <unistd.h>
 #else
-#if !defined(__uxp__) && !defined(USL)
+#if !defined(USL)
 #include <osfcn.h>
 #endif
 #endif
--- a/cde/programs/dtinfo/DtMmdb/dstr/dstr_test.C
+++ b/cde/programs/dtinfo/DtMmdb/dstr/dstr_test.C
@@ -26,9 +26,7 @@
 #include "utility/pm_random.h"
 #include "utility/funcs.h"

-#if defined(__uxp__) 
-#include <sys/times.h>
-#elif __osf__
+#if defined(__osf__)
 #include <sys/time.h>
 #endif

@@ -55,17 +53,11 @@ int dstr_test(int argc, char** argv)
      int out_cts = atoi(argv[3]);
      int cycles = atoi(argv[4]);

-#ifdef __uxp__
-      int seed;
-      struct tms tp;
-      if ((seed = (int)times(&tp)) < 0)
-	seed = 19;
-#else
      struct timeval tp;
      struct timezone tzp;

      int seed = ( gettimeofday(&tp, &tzp) == 0 ) ? int(tp.tv_sec) : 19;
-#endif
+
      pm_random rand_gen;
      rand_gen.seed(seed);

--- a/cde/programs/dtinfo/DtMmdb/dti_excs/Destructable_il.hh
+++ b/cde/programs/dtinfo/DtMmdb/dti_excs/Destructable_il.hh
@@ -98,7 +98,7 @@ Destructable::~Destructable()
 // This code relies on the fact that in cfront 2.1 this qualified
 // call to the destructor will actually call the virtual destructor. 

-#if (!defined(hpux)) && (!defined(__uxp__)) && (CC_VERSION < 30)
+#if !defined(hpux) && (CC_VERSION < 30)
 inline void
 Destructable::destruct()
 {
--- a/cde/programs/dtinfo/DtMmdb/dti_excs/Exception.hh
+++ b/cde/programs/dtinfo/DtMmdb/dti_excs/Exception.hh
@@ -108,7 +108,7 @@ protected:
 friend class Jump_Environment;
 friend class Exceptions;

-#if defined(hpux)||defined(__uxp__)
+#if defined(hpux)
 #define MakeOperatorNewPublic
 #endif

--- a/cde/programs/dtinfo/DtMmdb/object/random_gen.C
+++ b/cde/programs/dtinfo/DtMmdb/object/random_gen.C
@@ -33,17 +33,10 @@ random_gen::~random_gen()

 random_gen::random_gen()
 {
-#ifdef __uxp__
-   int seed;
-   struct tms tp;
-   if ((seed = (int)times(&tp)) < 0)
-      seed = 19;
-#else
   struct timeval tp;
   struct timezone tzp;

   int seed = ( gettimeofday(&tp, &tzp) == 0 ) ? int(tp.tv_sec) : 19;
-#endif

 #ifdef CONTROLLED_SEED
 if ( getenv("SEED") )
--- a/cde/programs/dtinfo/DtMmdb/schema/token.C
+++ b/cde/programs/dtinfo/DtMmdb/schema/token.C
@@ -46,7 +46,7 @@
 #if defined(__osf__) || defined(linux) || defined(CSRG_BASED) || defined(sun)
 #include <unistd.h>
 #else
-#if !defined(__uxp__) && !defined(USL)
+#if !defined(USL)
 #include <osfcn.h>
 #endif
 #endif
--- a/cde/programs/dtinfo/DtMmdb/storage/store_test.C
+++ b/cde/programs/dtinfo/DtMmdb/storage/store_test.C
@@ -109,17 +109,11 @@ int page_cache_test_1(int argc, char** argv)
      return 1;
   }

-#ifdef __uxp__
-   int seed;
-   struct tms tp;
-   if ((seed = (int)times(&tp)) < 0)
-      seed = 19;
-#else
   struct timeval tp;
   struct timezone tzp;

   int seed = ( gettimeofday(&tp, &tzp) == 0 ) ? int(tp.tv_sec) : 19;
-#endif
+
   pm_random rand_gen;
   rand_gen.seed(seed);

--- a/cde/programs/dtinfo/DtMmdb/utility/config.h
+++ b/cde/programs/dtinfo/DtMmdb/utility/config.h
@@ -29,7 +29,7 @@
 # define MMDB_LITTLE_ENDIAN  // i386
 #else
 # ifdef OLIAS_BIG_ENDIAN
-#  define MMDB_BIG_ENDIAN     // sun, rs/6000, hp, uxpds
+#  define MMDB_BIG_ENDIAN     // sun, rs/6000, hp
 # else
 #  ifdef OLIAS_DEFAULT_ENDIAN
 #   ifdef MMDB_BIG_ENDIAN