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

Remove Unixware and openserver support

Browse Source
This commit is contained in:
chase
2018-05-19 19:50:35 -05:00
committed by Jon Trulson
parent beea573d17
commit 07900bd93b
375 changed files with 725 additions and 9112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cde/programs/dtinfo/dtinfo/src/Agents/BookmarkEditMotif.C
View File

@@ -93,10 +93,8 @@ using namespace std;
int BookmarkEdit::g_modified_count = 0;
#ifdef SVR4
#ifndef USL
#include <libintl.h>
#endif
#endif
#define THIS_CLASS BookmarkEdit
#define ON_ACTIVATE(WOBJ,FUNC) \

2
cde/programs/dtinfo/dtinfo/src/Agents/PrefAgentMotif.C
View File

@@ -88,10 +88,8 @@
#include <X11/cursorfont.h>
#ifdef SVR4
#ifndef USL
#include <libintl.h> // 1/21/94 yuji
#endif
#endif
/* Update time in milliseconds when arrow button held down. */
#define CHANGE_SPEED 300

2
cde/programs/dtinfo/dtinfo/src/Agents/SearchResultsAgentMotif.C
View File

@@ -88,10 +88,8 @@ using namespace std;
#include <WWL/WXmPanedWindow.h>
#ifdef SVR4
#ifndef USL
#include <libintl.h>
#endif
#endif
static Boolean g_allow_query_text_change;

22
cde/programs/dtinfo/dtinfo/src/Agents/SearchScopeAgentMotif.C
View File

@@ -99,10 +99,8 @@
#include <WWL/WXmMessageBox.h>
#ifdef SVR4
#ifndef USL
#include <libintl.h> // 1/19/94 yuji
#endif
#endif
#include <string.h>
#include <iostream>
@@ -123,26 +121,6 @@ extern "C"
#endif
#ifdef USL
strcasecmp(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);
}
#endif
#define CLASS SearchScopeAgent
#include "create_macros.hh"

2
cde/programs/dtinfo/dtinfo/src/Agents/SearchScopeList.C
View File

@@ -76,10 +76,8 @@
#include <string.h>
#ifdef SVR4
#ifndef USL
#include <libintl.h>
#endif
#endif
#include <string.h>
#include <iostream>

16
cde/programs/dtinfo/dtinfo/src/Basic/FolioObject.C
View File

@@ -176,7 +176,7 @@ FolioObject::notify (u_int notify_type, void *notify_data)
// /////////////////////////////////////////////////////////////////
void
#if defined(SC3) || defined(__osf__) || defined(USL) || defined(__SunOS)
#if defined(SC3) || defined(__osf__) || defined(__SunOS)
FolioObject::add_dependent (FolioObject *dependent, notify_handler_t handler,
#else
FolioObject::add_dependent (void *dependent, notify_handler_t handler,
@@ -184,7 +184,7 @@ FolioObject::add_dependent (void *dependent, notify_handler_t handler,
u_int notify_type, void *dependent_data)
{
// Adds to begining because that's easiest.
#if defined(SC3) || defined(__osf__) || defined(USL) || defined(__SunOS)
#if defined(SC3) || defined(__osf__) || defined(__SunOS)
f_dependents = new Dependent (&f_dependents, f_dependents,
dependent, NULL, handler,
notify_type, dependent_data);
@@ -206,7 +206,7 @@ FolioObject::add_dependent (void *dependent, notify_handler_t handler,
// by mistake like this. We'll just have to cast it to a FolioObject
// when the call through it is made and hope the compiler doesn't
// expect it to point to an actual FolioObject (or whatever, eg: WWL).
#if defined(SC3) || defined(__osf__) || defined(USL) || defined(__SunOS)
#if defined(SC3) || defined(__osf__) || defined(__SunOS)
ON_DEBUG(printf ("@@@ adding to depend_on_list of %p\n", dependent));
dependent->f_depend_on_list =
new DependOnList (dependent->f_depend_on_list, f_dependents);
@@ -244,7 +244,7 @@ FolioObject::remove_depend_on (FolioObject *target, Dependent *d)
// /////////////////////////////////////////////////////////////////
void
#if defined(SC3) || defined(__osf__) || defined(USL) || defined(__SunOS)
#if defined(SC3) || defined(__osf__) || defined(__SunOS)
FolioObject::remove_dependent (FolioObject *dependent,
#else
FolioObject::remove_dependent (void *dependent,
@@ -258,7 +258,7 @@ FolioObject::remove_dependent (void *dependent,
// That means that each handler added must be removed!
for (d = &f_dependents; *d != NULL; d = &((*d)->f_next))
{
#if defined(SC3) || defined(__osf__) || defined(USL) || defined(__SunOS)
#if defined(SC3) || defined(__osf__) || defined(__SunOS)
if ((*d)->f_dependent == dependent &&
#else
if ((*d)->f_dependent == (FolioObject*)dependent &&
@@ -272,7 +272,7 @@ FolioObject::remove_dependent (void *dependent,
// f_folio_object will be NULL if the Dependent object was
// created in add_dependent! DJB 11/10/92
assert ((*d)->f_folio_object != NULL);
#if defined(SC3) || defined(__osf__) || defined(USL) || defined(__SunOS)
#if defined(SC3) || defined(__osf__) || defined(__SunOS)
remove_depend_on (dependent, *d);
#else
remove_depend_on ((FolioObject*)dependent, *d);
@@ -342,7 +342,7 @@ FolioObject::release_depend_on_list()
// by deleting that handle!!!
void
#if defined(SC3) || defined(__osf__) || defined(USL) || defined(__SunOS)
#if defined(SC3) || defined(__osf__) || defined(__SunOS)
FolioObject::observe (FolioObject *real_this, FolioObject *target,
#else
FolioObject::observe (void *real_this, FolioObject *target,
@@ -358,7 +358,7 @@ FolioObject::observe (void *real_this, FolioObject *target,
// ---
// OK, instead we will have to pass in the "real" this pointer which
// may be different from the this pointer visible in this routine.
#if defined(SC3) || defined(__osf__) || defined(USL) || defined(__SunOS)
#if defined(SC3) || defined(__osf__) || defined(__SunOS)
target->f_dependents =
new Dependent (&target->f_dependents, target->f_dependents,
real_this, this,

6
cde/programs/dtinfo/dtinfo/src/Basic/FolioObject.hh
View File

@@ -94,7 +94,7 @@ public: // functions
#define AddDependentd(CB, TYPE, DATA) \
add_dependent (this, (notify_handler_t)CB, TYPE, DATA)
#if defined(SC3) || defined(__osf__) || defined(USL) || defined(__SunOS)
#if defined(SC3) || defined(__osf__) || defined(__SunOS)
void add_dependent (FolioObject *dependent, notify_handler_t handler,
u_int notify_type, void *dependent_data = NULL);
#else
@@ -107,7 +107,7 @@ public: // functions
#define RemoveDependentd(CB, TYPE, DATA) \
remove_dependent(this, (notify_handler_t)CB, TYPE, DATA)
#if defined(SC3) || defined(__osf__) || defined(USL) || defined(__SunOS)
#if defined(SC3) || defined(__osf__) || defined(__SunOS)
void remove_dependent (FolioObject *dependent, notify_handler_t handler,
u_int notify_type, void *dependent_data = NULL);
#else
@@ -123,7 +123,7 @@ public: // functions
#define Observed(TARG, TYPE, CB, DATA) \
observe (this, TARG, (notify_handler_t) CB, TYPE, DATA)
#if defined(SC3) || defined(__osf__) || defined(USL) || defined(__SunOS)
#if defined(SC3) || defined(__osf__) || defined(__SunOS)
void observe (FolioObject *real_this, FolioObject *target,
notify_handler_t callback, u_int notify_type,
void *client_data = NULL);

22
cde/programs/dtinfo/dtinfo/src/Basic/List.C
View File

@@ -46,28 +46,6 @@
#include "Prelude.h"
#ifdef USL
strcasecmp(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);
}
#endif
// /////////////////////////////////////////////////////////////////
// class constructor
// /////////////////////////////////////////////////////////////////

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

@@ -26,10 +26,7 @@
#define C_OrderList
#define L_Basic
#include <Prelude.h>
#if !defined(USL)
#include <strings.h>
#endif
// //////////////////////////////////////////////////////////////
// Public methods

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

@@ -38,8 +38,6 @@ DependSubdirs($(SUBDIRS))
SYS_LIBRARIES=-L/usr/lib/X11/Metro/lib -lnsl -lsocked -lgen
#elif defined(RsArchitecture) || defined(AIXArchitecture)
SYS_LIBRARIES=-lm -liconv /usr/lib/libpthreads.a -blibpath:/usr/dt/lib:/X11/lib:/usr/lib/threads:/usr/lib:/lib
#elif defined(USLArchitecture)
SYS_LIBRARIES=-lm -lfs
#elif defined(HPArchitecture)
SYS_LIBRARIES=$(DYNAMIC) -lm
#elif defined(LinuxArchitecture)
@@ -316,7 +314,7 @@ includes:: Prelude.h dfiles messages
#if defined(HPArchitecture) ||defined (AIXArchitecture) || \
defined(AlphaArchitecture) || \
(defined(SunArchitecture) && CplusplusCompilerMajorVersion < 6) || \
defined(USLArchitecture) || defined(BSDArchitecture)
defined(BSDArchitecture)
# ifndef Dont_Use_Templates_Repository
# define Dont_Use_Templates_Repository
UAS_INCLUDES=-I./UAS/Base
@@ -326,10 +324,6 @@ SUBDIR_TEMPL_INCLUDES=$(UAS_INCLUDES) $(DTSEARCH_INCLUDES) $(COMMON_CLASS_INCLUD
#if defined(HPArchitecture)
SpecialCPlusPlusObjectRule(Templates.o,,+pti all_tmpls $(SUBDIR_TEMPL_INCLUDES))
#elif defined(USLArchitecture)
SpecialCPlusPlusObjectRule(Templates.o,,+Tall $(SUBDIR_TEMPL_INCLUDES))
SpecialCPlusPlusObjectRule(Templates2.o,,+Tall $(SUBDIR_TEMPL_INCLUDES))
SpecialCPlusPlusObjectRule(Templates3.o,,+Tall $(SUBDIR_TEMPL_INCLUDES))
#elif (defined(SunArchitecture) && CplusplusCompilerMajorVersion < 4)
SpecialCPlusPlusObjectRule(Templates.o,,+Tall_tmpls $(SUBDIR_TEMPL_INCLUDES))
#elif defined(AlphaArchitecture)
@@ -381,7 +375,7 @@ makelibTsubsubdir(UAS,MMDB)
#endif
#if defined(Dont_Use_Templates_Repository) && (defined(AlphaArchitecture) || defined(USLArchitecture))
#if defined(Dont_Use_Templates_Repository) && defined(AlphaArchitecture)
DEPLIBS=$(OLIASLIBS) $(UAS_TEMPLATES) $(OLIAS)/mmdb/libMMDB.a Templates.o Templates2.o Templates3.o
LOCAL_LIBRARIES=$(Libs) Templates.o Templates2.o Templates3.o
#elif defined (AIXArchitecture)
@@ -433,11 +427,7 @@ clean::
dfiles::
foreach_subdirs(dfiles, $(CLASSLIBS))
#if defined(USLArchitecture)
GENCAT=gencat -m
#else
GENCAT=gencat
#endif
#define MACRO_Messages @(messages=; \ @@\
for i in $(MSGS) ; \ @@\

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

@@ -103,9 +103,6 @@ using namespace std;
#endif
#include <wchar.h>
#ifdef USL
#include <wctype.h>
#endif
LONG_LIVED_CC (MarkMgr,mark_mgr)

2
cde/programs/dtinfo/dtinfo/src/Preferences/BooleanPref.C
View File

@@ -61,7 +61,7 @@
#include <string.h>
#if defined(AIX) || defined(USL)
#if defined(AIX)
/* For strcasecmp() */
#include <strings.h>
#endif

2
cde/programs/dtinfo/dtinfo/src/Preferences/UserPreference.C
View File

@@ -63,7 +63,7 @@
#include <ctype.h>
#include <stdio.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

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

@@ -81,7 +81,7 @@
#endif
#include <wchar.h>
#if defined(USL) || defined(linux) || defined(CSRG_BASED)
#if defined(linux) || defined(CSRG_BASED)
#include <wctype.h>
#endif

8
cde/programs/dtinfo/dtinfo/src/Support/xList.C
View File

@@ -99,15 +99,7 @@ xList<T>::append (const T &element)
template<class T> void
xList<T>::remove (List_Iterator<T> &it)
{
#ifndef USL
delete (Link<T> *) List_base::remove (it);
#else
// this is obviously a memory leak on novell, but
// i can't get the novell compiler to allow this delete
// "argument of delete too complicated (must be simple identifier)"
List_base::remove (it);
#endif
}
#endif /* _xList_cc */

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

@@ -72,7 +72,7 @@ private:
template <class T>
#if defined(_IBMR2) || defined(__osf__) || \
defined(USL) || defined(linux) || defined(CSRG_BASED) || defined(sun)
defined(linux) || defined(CSRG_BASED) || defined(sun)
class xList : public List_base
#else
class xList : private List_base
@@ -83,7 +83,7 @@ class xList : private List_base
#ifdef SC3
friend class List_Iterator<T>;
#else
#if !defined(_IBMR2) && !defined(__osf__) && !defined(USL) && \
#if !defined(_IBMR2) && !defined(__osf__) && \
!defined(linux) && !defined(CSRG_BASED) && !defined(sun)
template <class T> friend class List_Iterator;
#endif

139
cde/programs/dtinfo/dtinfo/src/Templates.C
View File

@@ -277,145 +277,6 @@ class UpdateMenu;
#else
#ifdef USL
#pragma instantiate CC_TValSlist<SegClientData*>
#pragma instantiate CC_TValSlistIterator<SegClientData*>
#pragma instantiate UAS_Receiver<UpdateMenu>
#pragma instantiate UAS_PtrList<UAS_String>
#pragma instantiate UAS_Pointer<UAS_String>
#pragma instantiate UAS_Pointer<UAS_Common>
#pragma instantiate UAS_Pointer<UAS_EmbeddedObject>
#pragma instantiate UAS_Pointer<UAS_Collection>
#pragma instantiate UAS_Pointer<UAS_Path>
#pragma instantiate UAS_Pointer<UAS_StyleSheet>
#pragma instantiate UAS_Pointer<Graphic>
#pragma instantiate UAS_Pointer<Mark>
#pragma instantiate UAS_Pointer<MarkUnitInfo>
#pragma instantiate UAS_List<UAS_StyleSheet>
#pragma instantiate UAS_List<UAS_Common>
#pragma instantiate UAS_List<UAS_SearchResults>
#pragma instantiate UAS_List<UAS_SearchEngine>
#pragma instantiate UAS_List<MarkUnitInfo>
#pragma instantiate UAS_PtrList<FactoryEntry>
#pragma instantiate UAS_PtrList<MMDB>
#pragma instantiate UAS_PtrList<const char>
#pragma instantiate UAS_Pointer<UAS_BookcaseEntry>
#pragma instantiate UAS_Pointer<DtSR_BookcaseSearchEntry>
#pragma instantiate UAS_Pointer<DtSR_SearchResults>
#pragma instantiate UAS_Pointer<DtSR_SearchResultsEntry>
#pragma instantiate UAS_Pointer<DtSR_SearchEngine>
#pragma instantiate Dict<UAS_String, UAS_Pointer<DtSR_SearchResultsEntry> >
#pragma instantiate Dict<UAS_String, int>
#pragma instantiate Dict<UAS_String, unsigned long>
#pragma instantiate DictIter<UAS_String, unsigned long>
#pragma instantiate DictIter<UAS_String, UAS_Pointer<DtSR_SearchResultsEntry> >
#pragma instantiate UAS_List<DtSR_BookcaseSearchEntry>
#pragma instantiate UAS_List<DtSR_Stems>
#pragma instantiate UAS_List<UAS_List<UAS_String> >
#pragma instantiate UAS_ObjList<UAS_String>
#pragma instantiate xList<Ancestor *>
#pragma instantiate xList<UAS_Pointer<UAS_Common> >
#pragma instantiate xList<BookTab *>
#pragma instantiate xList<MarkTml *>
#pragma instantiate xList<MarkIcon *>
#pragma instantiate xList<NodeWindowAgent *>
#pragma instantiate xList<LibraryAgent *>
#pragma instantiate xList<MarkBase *>
#pragma instantiate xList<MarkCanvas *>
#pragma instantiate xList<UAS_Pointer<Mark> >
#pragma instantiate xList<Mark_mmdb *>
#pragma instantiate xList<const char *>
#pragma instantiate xList<MarkBase::open_func_t>
#pragma instantiate xList<MarkBase::mb_create_func_t>
#pragma instantiate xList<UAS_Pointer<Graphic > >
#pragma instantiate xList<Graphic *>
#pragma instantiate xList<GraphicAgent *>
#pragma instantiate xList<int>
#pragma instantiate xList<long>
#pragma instantiate xList<unsigned long>
#pragma instantiate xList<BookmarkEdit *>
#pragma instantiate xList<UAS_SearchScope *>
#pragma instantiate xList<InfobaseEntry *>
#pragma instantiate xList<Header *>
#pragma instantiate xList<PixmapPidObj *>
#pragma instantiate xList<PsProcess *>
#pragma instantiate UAS_Sender<UAS_SearchMsg>
#pragma instantiate UAS_Sender<UAS_StatusMsg>
#pragma instantiate UAS_Sender<UAS_PartialDataMsg>
#pragma instantiate UAS_Sender<MarkCreated>
#pragma instantiate UAS_Sender<EditMark>
#pragma instantiate UAS_Sender<ViewMark>
#pragma instantiate UAS_Sender<MarkChanged>
#pragma instantiate UAS_Sender<MarkMoved>
#pragma instantiate UAS_Sender<MarkDeleted>
#pragma instantiate UAS_Sender<MarkSelectionChanged>
#pragma instantiate UAS_Sender<UpdateMenu>
#pragma instantiate UAS_PtrList<UAS_Sender<UpdateMenu> >
#pragma instantiate UAS_PtrList<UAS_Receiver<UpdateMenu> >
#pragma instantiate UAS_Sender<LinkAction>
#pragma instantiate UAS_Sender<UAS_DocumentRetrievedMsg>
#pragma instantiate UAS_Sender<UAS_CollectionRetrievedMsg>
#pragma instantiate UAS_Sender<HistoryAdd>
#pragma instantiate UAS_Sender<HistoryDelete>
#pragma instantiate UAS_Sender<SelectionChanged>
#pragma instantiate UAS_Sender<DetachGraphic>
#pragma instantiate UAS_Sender<ReAttachGraphic>
#pragma instantiate UAS_Sender<ScopeCreated>
#pragma instantiate UAS_Sender<ScopeDeleted>
#pragma instantiate UAS_Sender<ScopeRenamed>
#pragma instantiate UAS_Sender<InputReady>
#pragma instantiate UAS_Sender<WantInputReady>
#pragma instantiate UAS_Sender<WantInputReadyCancel>
#pragma instantiate UAS_Sender<CancelOperation>
#pragma instantiate UAS_Receiver<LinkAction>
#pragma instantiate UAS_Receiver<UAS_CollectionRetrievedMsg>
#pragma instantiate UAS_Receiver<UAS_DocumentRetrievedMsg>
#pragma instantiate UAS_Receiver<HistoryAdd>
#pragma instantiate UAS_Receiver<HistoryDelete>
#pragma instantiate UAS_Receiver<SelectionChanged>
#pragma instantiate UAS_Receiver<DetachGraphic>
#pragma instantiate UAS_Receiver<ReAttachGraphic>
#pragma instantiate UAS_Receiver<DisplayGraphic>
#pragma instantiate UAS_Receiver<InputReady>
#pragma instantiate UAS_Receiver<WantInputReady>
#pragma instantiate UAS_Receiver<WantInputReadyCancel>
#pragma instantiate UAS_Receiver<CancelOperation>
#pragma instantiate UAS_Receiver<UAS_LibraryDestroyedMsg>
#pragma instantiate Stack<char>
#pragma instantiate Stack<char *>
#pragma instantiate Stack<_dtCvSegment*>
#pragma instantiate Stack<PartialElementFeatures*>
#pragma instantiate Stack<TableDefn*>
#pragma instantiate Stack<TGDefn*>
#pragma instantiate Stack<SegClientData*>
#pragma instantiate CC_TPtrSlist<ColDefn>
#pragma instantiate CC_TPtrSlist<ColFormat>
#pragma instantiate CC_TPtrSlist<RowDefn>
#pragma instantiate hashTable<FontEntry,char>
#pragma instantiate Stack<connective_t>
#pragma instantiate CC_TPtrDlist<sr_DtCvSegment>
#pragma instantiate UAS_Pointer<UAS_List<DtSR_BookcaseSearchEntry> >
#else
#ifdef __osf__
#pragma define_template CC_TValSlist<SegClientData*>

73
cde/programs/dtinfo/dtinfo/src/Templates2.C
View File

@@ -262,76 +262,3 @@ CC_Boolean kv_pair<CC_String, FontList>::f_needRemove = FALSE;
CC_Boolean kv_pair<FontEntry, char>::f_needRemove = FALSE;
#endif
#ifdef USL
#pragma instantiate xList<InputMgrData*>
#pragma instantiate UAS_PtrList<UAS_Receiver<EditMark> >
#pragma instantiate UAS_PtrList<UAS_Receiver<ViewMark> >
#pragma instantiate UAS_PtrList<UAS_Receiver<MarkDeleted> >
#pragma instantiate UAS_PtrList<UAS_Receiver<MarkChanged> >
#pragma instantiate hashTable<CC_String, FontList>
#pragma instantiate UAS_PtrList<UAS_Sender<UAS_PartialDataMsg> >
#pragma instantiate UAS_PtrList<UAS_Receiver<UAS_PartialDataMsg> >
#pragma instantiate UAS_PtrList<UAS_Receiver<UAS_PartialDataMsg> >
#pragma instantiate UAS_Pointer<UAS_SearchEngine>
#pragma instantiate UAS_PtrList<UAS_Receiver<UAS_DocumentRetrievedMsg> >
#pragma instantiate UAS_PtrList<UAS_Sender<UAS_StatusMsg> >
#pragma instantiate UAS_PtrList<UAS_Receiver<UAS_StatusMsg> >
#pragma instantiate UAS_PtrList<UAS_Receiver<UAS_LibraryDestroyedMsg> >
#pragma instantiate UAS_PtrList<UAS_Sender<UAS_CollectionRetrievedMsg> >
#pragma instantiate UAS_PtrList<UAS_Receiver<UAS_CollectionRetrievedMsg> >
#pragma instantiate UAS_List<UAS_TextRun>
#pragma instantiate UAS_Pointer<UAS_SearchResultsEntry>
#pragma instantiate UAS_PtrList<UAS_Receiver<ScopeCreated> >
#pragma instantiate UAS_PtrList<UAS_Receiver<ScopeDeleted> >
#pragma instantiate UAS_PtrList<UAS_Sender<ScopeRenamed> >
#pragma instantiate UAS_PtrList<UAS_Receiver<ScopeRenamed> >
#pragma instantiate UAS_Pointer<UAS_SearchResults>
#pragma instantiate UAS_PtrList<UAS_Sender<UAS_SearchMsg> >
#pragma instantiate UAS_PtrList<UAS_Receiver<UAS_SearchMsg> >
#pragma instantiate UAS_Pointer<DtSR_Stems>
#pragma instantiate CC_TPtrSlist<kv_pair<FontEntry, char> >
#pragma instantiate pointer_vector<CC_TPtrSlist<kv_pair<FontEntry, char> > >
#pragma instantiate UAS_PtrList<UAS_Sender<EditMark> >
#pragma instantiate UAS_PtrList<UAS_Receiver<EditMark> >
#pragma instantiate UAS_PtrList<UAS_Receiver<ViewMark> >
#pragma instantiate UAS_PtrList<UAS_Receiver<MarkDeleted> >
#pragma instantiate UAS_PtrList<UAS_Receiver<MarkChanged> >
#pragma instantiate UAS_PtrList<UAS_Receiver<DetachGraphic> >
#pragma instantiate UAS_PtrList<UAS_Receiver<ReAttachGraphic> >
#pragma instantiate UAS_PtrList<UAS_Sender<CancelOperation> >
#pragma instantiate UAS_PtrList<UAS_Sender<InputReady> >
#pragma instantiate UAS_Pointer<UAS_List<UAS_String> >
#pragma instantiate UAS_PtrList<UAS_Sender<LinkAction> >
#pragma instantiate UAS_PtrList<UAS_Receiver<LinkAction> >
#pragma instantiate UAS_PtrList<UAS_Sender<DisplayGraphic> >
#pragma instantiate CC_TValSlist<char>
#pragma instantiate CC_TValSlist<char*>
#pragma instantiate CC_TValSlist<_dtCvSegment*>
#pragma instantiate CC_TValSlist<PartialElementFeatures*>
#pragma instantiate CC_TValSlist<TableDefn*>
#pragma instantiate CC_TValSlist<TGDefn*>
#pragma instantiate UAS_Receiver<UAS_SearchMsg>
#pragma instantiate UAS_PtrList<UAS_Sender<UAS_CancelRetrievalMsg> >
#pragma instantiate CC_TValSlist<UAS_String>
#pragma instantiate kv_pair<FontEntry, char>
#pragma instantiate kv_pair<CC_String, FontList>
#pragma instantiate kv_pair<CC_String, FontList>
#pragma instantiate CC_TPtrSlist<kv_pair<CC_String, FontList> >
#pragma instantiate pointer_vector<CC_TPtrSlist<kv_pair<CC_String, FontList> > >
#pragma instantiate CC_TValSlist<connective_t>
#pragma instantiate CC_TValSlistIterator<UAS_String>
#pragma instantiate CC_TValSlistIterator<connective_t>
#pragma instantiate CC_TValSlistIterator<TableDefn*>
#pragma instantiate CC_TValSlistIterator<TGDefn*>
#pragma instantiate CC_TValSlistIterator<PartialElementFeatures*>
#pragma instantiate CC_TValSlistIterator<_dtCvSegment*>
#pragma instantiate CC_TValSlistIterator<char*>
#pragma instantiate DictIter<UAS_String, int>
#endif

82
cde/programs/dtinfo/dtinfo/src/Templates3.C
View File

@@ -212,85 +212,3 @@ class RowDefn;
#pragma define_template UAS_PtrList<UAS_Sender<HistoryAdd> >
#endif
#ifdef USL
// new templates
#pragma instantiate UAS_List<UAS_String>
#pragma instantiate UAS_List<UAS_SearchResultsEntry>
#pragma instantiate UAS_ObjList<int>
#pragma instantiate UAS_Pointer<UAS_TextRun>
#pragma instantiate UAS_Pointer<UAS_List<UAS_TextRun> >
#pragma instantiate UAS_Pointer<UAS_List<UAS_SearchResultsEntry> >
#pragma instantiate UAS_Pointer<UAS_List<UAS_TextRun> >
// UAS_PtrList
#pragma instantiate UAS_PtrList<UAS_BookcaseEntry>
// UAS_PtrList<UAS_Receiver...
#pragma instantiate UAS_PtrList<UAS_Receiver<CancelOperation> >
#pragma instantiate UAS_PtrList<UAS_Receiver<SelectionChanged> >
#pragma instantiate UAS_PtrList<UAS_Receiver<DisplayGraphic> >
#pragma instantiate UAS_PtrList<UAS_Receiver<MarkSelectionChanged> >
// UAS_PtrList<UAS_Sender...
#pragma instantiate UAS_PtrList<UAS_Sender<MarkChanged> >
#pragma instantiate UAS_PtrList<UAS_Sender<UAS_LibraryDestroyedMsg> >
#pragma instantiate UAS_PtrList<UAS_Sender<ViewMark> >
#pragma instantiate UAS_PtrList<UAS_Sender<MarkDeleted> >
#pragma instantiate UAS_PtrList<UAS_Sender<DetachGraphic> >
#pragma instantiate UAS_PtrList<UAS_Sender<ReAttachGraphic> >
#pragma instantiate UAS_PtrList<UAS_Sender<SelectionChanged> >
#pragma instantiate UAS_PtrList<UAS_Sender<MarkCreated> >
#pragma instantiate UAS_PtrList<UAS_Sender<MarkSelectionChanged> >
#pragma instantiate UAS_PtrList<UAS_Sender<UAS_DocumentRetrievedMsg> >
#pragma instantiate UAS_PtrList<UAS_Sender<ScopeCreated> >
#pragma instantiate UAS_PtrList<UAS_Sender<ScopeDeleted> >
// UAS_Receiver
#pragma instantiate UAS_Receiver<MarkDeleted>
#pragma instantiate UAS_Receiver<ScopeDeleted>
#pragma instantiate UAS_Receiver<EditMark>
#pragma instantiate UAS_Receiver<MarkMoved>
#pragma instantiate UAS_Receiver<ViewMark>
#pragma instantiate UAS_Receiver<MarkChanged>
#pragma instantiate UAS_Receiver<MarkCreated>
#pragma instantiate UAS_Receiver<MarkSelectionChanged>
#pragma instantiate UAS_Receiver<UAS_ErrorMsg>
#pragma instantiate UAS_Receiver<UAS_StatusMsg>
#pragma instantiate UAS_Receiver<ScopeCreated>
#pragma instantiate UAS_Receiver<ScopeRenamed>
#pragma instantiate CC_TPtrSlist<sr_DtCvSegment>
#pragma instantiate Stack<UAS_String>
// UAS_Sender
#pragma instantiate UAS_Sender<UAS_CancelRetrievalMsg>
#pragma instantiate UAS_Sender<UAS_ErrorMsg>
#pragma instantiate UAS_Sender<DisplayGraphic>
#pragma instantiate UAS_Sender<UAS_LibraryDestroyedMsg>
// UAS_PtrList<UAS_Receiver...
#pragma instantiate UAS_PtrList<UAS_Receiver<UAS_ErrorMsg> >
#pragma instantiate UAS_PtrList<UAS_Receiver<WantInputReady> >
#pragma instantiate UAS_PtrList<UAS_Receiver<WantInputReadyCancel> >
#pragma instantiate UAS_PtrList<UAS_Receiver<UAS_CancelRetrievalMsg> >
#pragma instantiate UAS_PtrList<UAS_Receiver<MarkCreated> >
#pragma instantiate UAS_PtrList<UAS_Receiver<MarkMoved> >
#pragma instantiate UAS_PtrList<UAS_Receiver<HistoryAdd> >
#pragma instantiate UAS_PtrList<UAS_Receiver<HistoryDelete> >
#pragma instantiate UAS_PtrList<UAS_Receiver<InputReady> >
// UAS_PtrList<UAS_Sender...
#pragma instantiate UAS_PtrList<UAS_Sender<WantInputReady> >
#pragma instantiate UAS_PtrList<UAS_Sender<WantInputReadyCancel> >
#pragma instantiate UAS_PtrList<UAS_Sender<HistoryDelete> >
#pragma instantiate UAS_PtrList<UAS_Sender<MarkMoved> >
#pragma instantiate UAS_PtrList<UAS_Sender<UAS_ErrorMsg> >
#pragma instantiate UAS_PtrList<UAS_Sender<HistoryAdd> >
#endif

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(__osf__) || defined(USL) || defined(linux)
#if (defined(sparc) && defined(SC3)) || defined(__osf__) || 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(USL) || defined(linux) || defined(CSRG_BASED)
#if defined(linux) || defined(CSRG_BASED)
#include <string.h>
#else
#include <strings.h>

2
cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_BookcaseEntry.hh
View File

@@ -66,7 +66,7 @@ class DtSR_BookcaseSearchEntry : public DtSR_BookcaseEntry
UAS_Pointer<UAS_Common> bcase() { return uas_bcase; }
#if !defined(SC3) && !defined(__osf__) && !defined(USL) && !defined(linux)
#if !defined(SC3) && !defined(__osf__) && !defined(linux)
protected:
template <class T> friend class UAS_Pointer;

7
cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_SearchResults.C
View File

@@ -64,13 +64,6 @@ DtSR_SearchResults::sort(UAS_Pointer<UAS_List<UAS_SearchResultsEntry> > res)
for (unsigned int i = 0; i < list_length; i++) {
for (unsigned int j = i+1; j < list_length; j++) {
#ifdef USL
// this line does nothing, but if you remove it
// this code will not compile on novell. go figure. rCs
UAS_Pointer<UAS_SearchResultsEntry> reflisti = Ref_list[i];
#endif
if (Ref_list[i]->relevance() < Ref_list[j]->relevance()) {
UAS_Pointer<UAS_SearchResultsEntry> temp = Ref_list[i];
Ref_list[i] = Ref_list[j];

6
cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_SearchZones.C
View File

@@ -28,12 +28,6 @@
#include <strings.h> // strcasecmp()
#endif
#if defined(USL)
extern "C" {
extern char *strcasecmp (const char*, const char *);
}
#endif
#include "DtSR_SearchZones.hh"
DtSR_SearchZones::uas_zones

2
cde/programs/dtinfo/dtinfo/src/main.C
View File

@@ -59,10 +59,8 @@
#include <locale.h>
#ifdef SVR4
#ifndef USL
#include <libintl.h>
#endif
#endif
#if defined(sparc) && defined(MAP_ZERO)
#include <sys/mman.h>