debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove UXPDS support

Browse Source
This commit is contained in:
chase
2018-05-15 20:11:08 -05:00
committed by Jon Trulson
parent 0f8233dadd
commit 8a4f389634
319 changed files with 317 additions and 8776 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cde/programs/dtinfo/DtMmdb/HardCopy/TemplatesAutoNumber.C
View File

@@ -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 /* { */

2
cde/programs/dtinfo/DtMmdb/HardCopy/all_tmpls
View File

@@ -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

2
cde/programs/dtinfo/DtMmdb/StyleSheet/DocParser.C
View File

@@ -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) && \

6
cde/programs/dtinfo/DtMmdb/StyleSheet/Expression.C
View File

@@ -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

4
cde/programs/dtinfo/DtMmdb/StyleSheet/FeatureSet.C
View File

@@ -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 */
}

2
cde/programs/dtinfo/DtMmdb/StyleSheet/SSTemplates.C
View File

@@ -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_;

2
cde/programs/dtinfo/DtMmdb/StyleSheet/all_tmpls
View File

@@ -1,2 +0,0 @@
// all_tmplts - force instantiation of all templates under UXPDS
@all

2
cde/programs/dtinfo/DtMmdb/compression/ps.C
View File

@@ -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

2
cde/programs/dtinfo/DtMmdb/compression/sgml.C
View File

@@ -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

12
cde/programs/dtinfo/DtMmdb/dstr/dstr_test.C
View File

@@ -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);

2
cde/programs/dtinfo/DtMmdb/dti_excs/Destructable_il.hh
View File

@@ -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()
{

2
cde/programs/dtinfo/DtMmdb/dti_excs/Exception.hh
View File

@@ -108,7 +108,7 @@ protected:
friend class Jump_Environment;
friend class Exceptions;
#if defined(hpux)||defined(__uxp__)
#if defined(hpux)
#define MakeOperatorNewPublic
#endif

7
cde/programs/dtinfo/DtMmdb/object/random_gen.C
View File

@@ -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") )

2
cde/programs/dtinfo/DtMmdb/schema/token.C
View File

@@ -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

8
cde/programs/dtinfo/DtMmdb/storage/store_test.C
View File

@@ -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);

2
cde/programs/dtinfo/DtMmdb/utility/config.h
View File

@@ -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

2
cde/programs/dtinfo/dtinfo/src/Agents/Imakefile
View File

@@ -33,7 +33,7 @@ SimpleLibrary($(LIBNAME), $(OBJS), $(LIBDIR))
XCOMM RealLibrary($(LIBNAME), $(OBJS), $(LIBDIR))
#endif
#if defined(HPArchitecture)||defined(UXPArchitecture)
#if defined(HPArchitecture)
XCOMM
XCOMM SWM: +i option Hack for HP compiler. Problem is
XCOMM with things declared as static void _* as class members.

2
cde/programs/dtinfo/dtinfo/src/Basic/OrderList.C
View File

@@ -27,7 +27,7 @@
#define L_Basic
#include <Prelude.h>
#if !defined(__uxp__) && !defined(USL)
#if !defined(USL)
#include <strings.h>
#endif

10
cde/programs/dtinfo/dtinfo/src/Imakefile
View File

@@ -314,7 +314,7 @@ all:: Prelude.h dfiles messages Dtinfo
includes:: Prelude.h dfiles messages
#if defined(HPArchitecture) ||defined (AIXArchitecture) || \
defined(UXPArchitecture) || defined(AlphaArchitecture) || \
defined(AlphaArchitecture) || \
(defined(SunArchitecture) && CplusplusCompilerMajorVersion < 6) || \
defined(USLArchitecture) || defined(BSDArchitecture)
# ifndef Dont_Use_Templates_Repository
@@ -330,7 +330,7 @@ SpecialCPlusPlusObjectRule(Templates.o,,+pti all_tmpls $(SUBDIR_TEMPL_INCLUDES))
SpecialCPlusPlusObjectRule(Templates.o,,+Tall $(SUBDIR_TEMPL_INCLUDES))
SpecialCPlusPlusObjectRule(Templates2.o,,+Tall $(SUBDIR_TEMPL_INCLUDES))
SpecialCPlusPlusObjectRule(Templates3.o,,+Tall $(SUBDIR_TEMPL_INCLUDES))
#elif defined(UXPArchitecture) || (defined(SunArchitecture) && CplusplusCompilerMajorVersion < 4)
#elif (defined(SunArchitecture) && CplusplusCompilerMajorVersion < 4)
SpecialCPlusPlusObjectRule(Templates.o,,+Tall_tmpls $(SUBDIR_TEMPL_INCLUDES))
#elif defined(AlphaArchitecture)
SpecialCPlusPlusObjectRule(Templates.o,,-ptf $(SUBDIR_TEMPL_INCLUDES))
@@ -400,10 +400,6 @@ XCOMM Eventually could replace the following rule with r6 rule:
XCOMM "ComplexCplusplusProgramTarget"
XCOMM for the time being, i added the below hack - rCs
#if defined(UXPArchitecture)
PRE_LD = LD_RUN_PATH=/usr/dt/lib:/X11/lib
#endif
ComplexCPlusPlusProgram($(PROGRAM_NAME))
RESFILES = Macros.res Strings.res \
@@ -437,7 +433,7 @@ clean::
dfiles::
foreach_subdirs(dfiles, $(CLASSLIBS))
#if defined(UXPArchitecture) || defined(USLArchitecture)
#if defined(USLArchitecture)
GENCAT=gencat -m
#else
GENCAT=gencat

20
cde/programs/dtinfo/dtinfo/src/Managers/CatMgr.C
View File

@@ -130,29 +130,9 @@ CatMgr::catgets(int set_num, int msg_num, const char* def)
msg = ::catgets(f_catd, set_num, msg_num, def);
else
msg = ::catgets(f_catd, set_num, msg_num, f_default);
#if defined(UXPDS) && defined(GENCAT_BUG)
for (; *msg == ' ' || *msg == '\t'; msg++);
#endif
int msglen = strlen(msg);
len = msglen;
f_msg = new char[msglen + 1];
#if defined(UXPDS) && defined(GENCAT_BUG)
#ifdef DEBUG
cerr << "(DEBUG) catgets msg=<" << msg << ">\n" << flush;
#endif
// trim embracing double quotes on uxpds
if (msglen > 1 && *(msg + msglen - 1) == '"') {
if (*msg == *(msg + msglen - 1)) {
*(msg + msglen - 1) = '\0';
msg++;
msglen -= 2;
}
}
else if (*msg == '"') {
msg++;
msglen--;
}
#endif
*((char *) memcpy(f_msg, msg, len) + len) = '\0';
}
else {

3
cde/programs/dtinfo/dtinfo/src/Managers/TtIpcMgr.C
View File

@@ -201,7 +201,8 @@ TtIpcMgr::TtIpcMgr()
if( (tt_state = tt_default_session_set( xsession )) == TT_OK )
{
procid = ttdt_open( &ttfd, "Dtinfo", "Fujitsu", "CDE", True ) ;
//why is fujitsu mentioned here? 05/15/18 - C
if( (tt_state = tt_pointer_error( procid ))
== TT_OK )
{

5
cde/programs/dtinfo/dtinfo/src/OnlineRender/Imakefile
View File

@@ -30,10 +30,7 @@ make_msgs($(LIBNAME), $(MSGS))
dfiles:
#ifdef UXPArchitecture
SpecialCPlusPlusObjectRule(ORTemplates.o,, +Tall_tmpls -DEXPAND_TEMPLATES)
SpecialCPlusPlusExpandRule(ORTemplates..c,ORTemplates.C,+Tall_tmpls -DEXPAND_TEMPLATES)
#elif defined(LinuxArchitecture) || defined(BSDArchitecture)
#if defined(LinuxArchitecture) || defined(BSDArchitecture)
SpecialCPlusPlusObjectRule(ORTemplates.o,,-DEXPAND_TEMPLATES)
SpecialCPlusPlusExpandRule(ORTemplates..c,ORTemplates.C,-DEXPAND_TEMPLATES)
#endif

2
cde/programs/dtinfo/dtinfo/src/Query/Imakefile
View File

@@ -15,7 +15,7 @@ INCLUDES=$(CXXDEPENDINCLUDES) $(BROWSER_INCLUDES) $(COMMON_CLASS_INCLUDES)
OBJS=$(SRCS:.C=.o)
#if defined(HPArchitecture)||defined(UXPArchitecture)
#if defined(HPArchitecture)
/*
* SWM - Need to compile this file with +i so
* the correct code is generated. The HP compiler

2
cde/programs/dtinfo/dtinfo/src/Query/QueryEditor.C
View File

@@ -158,6 +158,8 @@ QueryEditor::edit_query (QueryGroup *query)
// You must not destroy and re-create the Restraint widget.
// Instead keep the same Restraint widget forever. - 10/22/94 kamiya
// This restriction no longer applies, remove this code safely - 05/15/18 - C
// Create a group with a single term if none provided.
if (query == NULL)
{

2
cde/programs/dtinfo/dtinfo/src/Support/xList.hh
View File

@@ -71,7 +71,7 @@ private:
};
template <class T>
#if defined(__uxp__) || defined(_IBMR2) || defined(__osf__) || \
#if defined(_IBMR2) || defined(__osf__) || \
defined(USL) || defined(linux) || defined(CSRG_BASED) || defined(sun)
class xList : public List_base
#else

2
cde/programs/dtinfo/dtinfo/src/UAS/Base/UAS_Base.hh
View File

@@ -32,7 +32,7 @@ class UAS_Base: public Destructable {
UAS_Base ();
virtual ~UAS_Base ();
int operator == (const UAS_Base &);
#if (defined(sparc) && defined(SC3)) || defined(__uxp__) || defined(__osf__) || defined(USL) || defined(linux)
#if (defined(sparc) && defined(SC3)) || defined(__osf__) || defined(USL) || defined(linux)
/* SC++ 4.0.1 does not like these being protected */
#else
protected:

2
cde/programs/dtinfo/dtinfo/src/UAS/Base/UAS_OQLParser.C
View File

@@ -24,7 +24,7 @@
/* Copyright (c) 1995 FUJITSU LIMITED */
/* All Rights Reserved */
#if defined(__uxp__) || defined(USL) || defined(linux) || defined(CSRG_BASED)
#if defined(USL) || defined(linux) || defined(CSRG_BASED)
#include <string.h>
#else
#include <strings.h>

2
cde/programs/dtinfo/dtinfo/src/all_tmpls
View File

@@ -1,2 +1,2 @@
// all_tmplts - force instantiation of all templates under HP-UX and UXPDS
// all_tmplts - force instantiation of all templates under HP-UX
@all

2
cde/programs/dtinfo/dtinfogen/infolib/etc/Imakefile
View File

@@ -308,7 +308,7 @@ SimpleCPlusPlusProgram(StyleUpdate, StyleUpdate.o $(TEMPLATE_OBJS) libOLAFParse.
#ifdef HPArchitecture
SpecialCPlusPlusObjectRule($(TEMPLATE_OBJS),,+pti all_tmpls)
#else
#if defined(UXPArchitecture) || (defined(SunArchitecture) && CplusplusCompilerMajorVersion < 4)
#if defined(SunArchitecture) && CplusplusCompilerMajorVersion < 4
SpecialCPlusPlusObjectRule($(TEMPLATE_OBJS),,+Tall_tmpls)
#endif
#endif

2
cde/programs/dtinfo/dtinfogen/infolib/etc/MixedGen.C
View File

@@ -34,7 +34,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#if !defined(__uxp__) && !defined(USL)
#if !defined(USL)
#include <strings.h>
#endif

2
cde/programs/dtinfo/dtinfogen/infolib/etc/NCFGen.C
View File

@@ -24,7 +24,7 @@
#include <stdio.h>
#include <stdlib.h>
#if !defined(__uxp__) && !defined(USL)
#if !defined(USL)
#include <strings.h>
#endif
#include <sstream>

2
cde/programs/dtinfo/dtinfogen/infolib/etc/SearchPath.C
View File

@@ -24,7 +24,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <stdarg.h>
#if !defined(__uxp__) && !defined(USL)
#if !defined(USL)
#include <strings.h>
#endif
#include <sys/stat.h>

2
cde/programs/dtinfo/dtinfogen/infolib/etc/all_tmpls
View File

@@ -1,2 +1,2 @@
// all_tmplts - force instantiation of all templates under HP-UX and UXPDS
// all_tmplts - force instantiation of all templates under HP-UX
@all

9
cde/programs/dtinfo/dtinfogen/infolib/etc/dtinfogen
View File

@@ -208,15 +208,6 @@ case "$OS" in
esac
;;
UNIX_System_V\ 4.2*)
# Based on DS/90 server...
case "`uname -m`" in
DS/90*)
ARCH=uxpds
;;
esac
;;
*4.2MP)
ARCH=mips
;;

2
cde/programs/dtinfo/mmdb/HardCopy/Imakefile
View File

@@ -67,7 +67,7 @@ OBJS = $(BASE_SRCS:.C=.o) $(EXTRA_SRCS:.C=.o)
#ifdef HPArchitecture
LinkSourceFile(all_tmpls,$(DTMMDBSRC)/HardCopy)
SpecialCPlusPlusObjectRule(TemplatesAutoNumber.o,,+pti all_tmpls -DEXPAND_TEMPLATES)
#elif defined(UXPArchitecture) || (defined(SunArchitecture) && CplusplusCompilerMajorVersion < 4)
#elif defined(SunArchitecture) && CplusplusCompilerMajorVersion < 4
LinkSourceFile(all_tmpls,$(DTMMDBSRC)/HardCopy)
SpecialCPlusPlusObjectRule(TemplatesAutoNumber.o,,+Tall_tmpls -DEXPAND_TEMPLATES)
#elif defined(AlphaArchitecture)

2
cde/programs/dtinfo/mmdb/StyleSheet/Imakefile
View File

@@ -107,7 +107,7 @@ VALIDATOR_SRCS = RendererHCV.C
#ifdef HPArchitecture
LinkSourceFile(all_tmpls,$(DTMMDBSRC)/StyleSheet)
SpecialCPlusPlusObjectRule(SSTemplates.o,,+pti all_tmpls -DEXPAND_TEMPLATES)
#elif defined(UXPArchitecture) || (defined(SunArchitecture) && CplusplusCompilerMajorVersion < 4)
#elif defined(SunArchitecture) && CplusplusCompilerMajorVersion < 4
LinkSourceFile(all_tmpls,$(DTMMDBSRC)/StyleSheet)
SpecialCPlusPlusObjectRule(SSTemplates.o,,+Tall_tmpls -DEXPAND_TEMPLATES)
#elif defined(AlphaArchitecture)