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