This patch removes support for Digital's (now HP's) Ultrix, like everyone else,
they seem to have no intentions of making the platform open source, and it was
replaced by OSF1/Tru64 Unix, which I am also planning to remove, so should
therefore be removed from the code.
Thank you for your time,
-Chase
From 5563b5c044c5f74f04f3872d03504be62ec55f26 Mon Sep 17 00:00:00 2001
From: chase <ch...@localhost.com>
Date: Thu, 26 Apr 2018 21:41:56 -0700
Subject: [PATCH] Remove ultrix code
---
cde/config/cf/Imake.cf | 17 +--
cde/config/cf/Imakefile | 1 -
cde/config/cf/ultrix.cf | 77 ----------
cde/config/imake/imakemdep.h | 5 +-
cde/doc/util/dbtoman/instant/general.h | 7 -
cde/lib/DtHelp/Helpos.c | 45 +-----
cde/lib/DtSvc/DtUtil2/DtosP.h | 2 -
cde/lib/DtTerm/TermPrim/TermPrimMessageCatI.h | 7 +-
cde/lib/tt/bin/dbck/prop.C | 5 +-
cde/lib/tt/bin/dbck/spec.C | 5 +-
cde/lib/tt/bin/dbck/spec_repair.C | 5 +-
cde/lib/tt/bin/shell/mover.C | 4 -
cde/lib/tt/bin/shell/remover.C | 4 -
cde/lib/tt/bin/tt_type_comp/mp_type_comp.C | 4 -
cde/lib/tt/bin/ttdbserverd/dm_server.C | 28 +---
cde/lib/tt/bin/tttar/tttar_file_utils.C | 4 -
cde/lib/tt/lib/api/c/api_xdr.h | 5 -
cde/lib/tt/lib/mp/mp_desktop.h | 11 --
cde/lib/tt/lib/mp/mp_rpc.h | 2 +-
cde/lib/tt/lib/mp/mp_rpc_client.C | 11 --
cde/lib/tt/lib/mp/mp_session.C | 2 +-
cde/lib/tt/lib/mp/mp_stream_socket.C | 4 -
cde/lib/tt/lib/realpath.ultrix.c | 144 ------------------
cde/lib/tt/lib/tt_options.h | 11 --
cde/lib/tt/lib/util/tt_int_rec.C | 3 -
cde/lib/tt/lib/util/tt_int_rec.h | 5 +-
cde/lib/tt/lib/util/tt_new.h | 4 -
cde/lib/tt/lib/util/tt_new_ptr.h | 4 -
cde/lib/tt/lib/util/tt_object.h | 3 -
cde/lib/tt/lib/util/tt_object_list.h | 4 -
cde/lib/tt/lib/util/tt_string.C | 3 -
cde/lib/tt/lib/util/tt_string.h | 3 -
cde/lib/tt/lib/util/tt_xdr_utils.C | 18 +--
cde/lib/tt/mini_isam/isalloc.c | 7 -
cde/lib/tt/mini_isam/iserror.c | 5 +-
cde/lib/tt/mini_isam/strdup.ultrix.c | 41 -----
cde/lib/tt/slib/mp_s_procid.C | 2 +-
cde/lib/tt/slib/mp_s_session.C | 129 +++++++---------
cde/lib/tt/slib/mp_typedb.C | 5 -
cde/lib/tt/slib/mp_typedb.h | 5 +-
cde/programs/dtaction/Main.c | 6 +-
cde/programs/dtcalc/calctool.h | 4 -
cde/programs/dtdocbook/instant/README | 1 -
cde/programs/dtdocbook/instant/general.h | 7 -
cde/programs/dtfile/FileManip.c | 12 +-
cde/programs/dtfile/FileMgr.c | 8 -
cde/programs/dtfile/Find.c | 2 +-
cde/programs/dtfile/Main.h | 4 -
cde/programs/dtfile/dtcopy/dtcopy.h | 4 -
cde/programs/dthelp/dthelpgen/helpgen.c | 4 -
cde/programs/dthelp/dthelpprint/PrintUtil.c | 4 -
cde/programs/dticon/main.h | 5 -
.../clients/dtinfo_start/dtinfo_start.h | 4 -
cde/programs/dtinfo/dtinfo/src/cgm/cgmcmds.c | 1 -
.../dtksh/ksh93/src/cmd/ksh93/sh/init.c | 4 -
cde/programs/dtksh/msgs.h | 4 -
cde/programs/dtlogin/genauth.c | 3 -
cde/programs/dtpad/main.c | 4 -
cde/programs/dtsession/Sm.h | 4 -
cde/programs/dtsession/Srv.h | 4 -
cde/programs/dtudcexch/excutil.h | 4 -
.../dtudcfonted/libfal/_falSetLocale.c | 8 +-
cde/programs/dtudcfonted/libfal/_fallcint.h | 12 --
cde/programs/dtudcfonted/ufont.c | 4 -
cde/programs/dtwm/DataBaseLoad.h | 4 -
cde/programs/dtwm/README | 2 +-
cde/programs/dtwm/WmGlobal.h | 4 -
67 files changed, 94 insertions(+), 684 deletions(-)
delete mode 100644 cde/config/cf/ultrix.cf
delete mode 100644 cde/lib/tt/lib/realpath.ultrix.c
delete mode 100644 cde/lib/tt/mini_isam/strdup.ultrix.c
diff --git a/cde/config/cf/Imake.cf b/cde/config/cf/Imake.cf
index 9d68cf5a..a9d112f9 100644
--- a/cde/config/cf/Imake.cf
+++ b/cde/config/cf/Imake.cf
@@ -18,22 +18,7 @@ XCOMM $TOG: Imake.cf /main/30 1998/04/28 13:55:25 barstow $
* 4. Create a .cf file with the name given by MacroFile.
*/
-#ifdef ultrix
-# define MacroIncludeFile <ultrix.cf>
-# define MacroFile ultrix.cf
-# ifdef vax
-# undef vax
-# define VaxArchitecture
-# endif
-# ifdef mips
-# undef mips
-# define MipsArchitecture
-# endif
-# undef ultrix
-# define UltrixArchitecture
-#endif /* ultrix */
-
-#if defined(vax) && !defined(UltrixArchitecture)
+#if defined(vax)
# define MacroIncludeFile <bsd.cf>
# define MacroFile bsd.cf
# undef vax
diff --git a/cde/config/cf/Imakefile b/cde/config/cf/Imakefile
index 663fc67e..aa39909d 100644
--- a/cde/config/cf/Imakefile
+++ b/cde/config/cf/Imakefile
@@ -88,7 +88,6 @@ sony.cf \
sun.cf \
svr3.cf \
svr4.cf \
-ultrix.cf \
usl.cf \
x386.cf \
xfree86.cf
diff --git a/cde/config/cf/ultrix.cf b/cde/config/cf/ultrix.cf
deleted file mode 100644
index 6ab1c89b..00000000
--- a/cde/config/cf/ultrix.cf
+++ /dev/null
@@ -1,77 +0,0 @@
-XCOMM platform: $XConsortium: ultrix.cf /main/68 1996/09/28 16:13:46 rws $
-
-#ifndef OSName
-# define OSName DefaultOSName
-#endif
-#ifndef OSMajorVersion
-# define OSMajorVersion DefaultOSMajorVersion
-#endif
-#ifndef OSMinorVersion
-# define OSMinorVersion DefaultOSMinorVersion
-#endif
-XCOMM operating system: OSName (OSMajorVersion.OSMinorVersion)
-
-#define HasNdbm YES
-#define HasPutenv YES
-#define HasShm YES
-#define LintLibFlag -o
-#define LintOpts -ax
-
-#if HasDECnet
-#define ExtraLibraries -ldnet
-#endif
-
-#if ThreadedX
-/* if you want to experiment, turn this on, but no guarantees */
-#define HasThreadSafeAPI NO
-#define HasPosixThreads YES
-#define ThreadPreStdAPIDefines -DXPRE_STANDARD_API
-#define ExtraLibraries -lpthreads -li
-#endif
-
-#ifdef VaxArchitecture
-#define PexNativeFPFormat PEXDEC_F_Floating
-#define NativeFPFormat DEC_F_Float
-#define UnalignedReferencesAllowed YES /* if arbitrary deref is okay */
-#define BuildServer NO
-#endif
-
-#ifdef MipsArchitecture
-#if OSMajorVersion > 4 || (OSMajorVersion == 4 && OSMinorVersion >= 2)
-#define XdecServer YES
-#define ServerOSDefines -DDDXTIME
-/* Even under ultrix 4.2, the compiler miscompiles some alloca calls */
-#define AllocateLocalDefines /* -DINCLUDE_ALLOCA_H */
-#else
-#define BuildServer NO
-#define AllocateLocalDefines /**/
-#endif
-#if !HasGcc
-#define NeedFunctionPrototypes YES
-#define PexCCOptions -Wf,-XNp15000,-XNd15000
-/*
- * NormalLibObjCompile - compile fragment for a library object file
- * do ld -x to remove line number symbols for libraries
- */
-#define NormalLibObjCompile(options) $(RM) $@ $*.os \ @@\
- && $(CC) -c options $(CFLAGS) $*.c \ @@\
- && $(LD) $(LDSTRIPFLAGS) -r $@ -o $*.os \ @@\
- && $(MV) $*.os $@
-#endif
-#endif
-
-#if HasGcc
-#ifdef VaxArchitecture
-#define CcCmd gcc -ansi -Dvax -Dultrix -fpcc-struct-return
-#endif
-#ifdef MipsArchitecture
-#define CcCmd gcc -ansi -Dmips -Dultrix -fpcc-struct-return
-#endif
-#define ServerCCOptions /* */
-#define AllocateLocalDefines /* */
-#endif
-
-#define ServerExtraDefines AllocateLocalDefines
-#define HasWChar32 YES
-
-#define MotifDefines -DNO_REGEX -DNO_REGCOMP -DNO_CONST
diff --git a/cde/config/imake/imakemdep.h b/cde/config/imake/imakemdep.h
index 6684eaf6..3e954e4b 100644
--- a/cde/config/imake/imakemdep.h
+++ b/cde/config/imake/imakemdep.h
@@ -605,7 +605,7 @@ char *cpp_argv[ARGUMENTS] = {
# define DEFAULT_OS_MINOR_REV "r %[0-9]"
/* No information available to generate default OSTeenyVersion value. */
# define DEFAULT_OS_NAME "srvm %[^\n]"
-#elif defined(sun) || defined(ultrix) || defined(linux) || defined(sony)
+#elif defined(sun) || defined(linux) || defined(sony)
/* uname -r returns "x.y[.z]", e.g. "5.4" or "4.1.3" */
# define DEFAULT_OS_MAJOR_REV "r %[0-9]"
# define DEFAULT_OS_MINOR_REV "r %*d.%[0-9]"
@@ -726,9 +726,6 @@ struct symtab predefs[] = {
#ifdef __mips__
{"__mips__", "1"},
#endif
-#ifdef ultrix
- {"ultrix", "1"},
-#endif
#ifdef stellar
{"stellar", "1"},
#endif
diff --git a/cde/doc/util/dbtoman/instant/general.h b/cde/doc/util/dbtoman/instant/general.h
index fd0784d1..2367be36 100644
--- a/cde/doc/util/dbtoman/instant/general.h
+++ b/cde/doc/util/dbtoman/instant/general.h
@@ -331,10 +331,3 @@ void PrintElemSummary(Element_t *);
void PrintElemTree(Element_t *);
void PrintStats(Element_t *);
void PrintIDList();
-
-/* ----- other declarations ----- */
-
-#ifdef ultrix
-#define strdup(s) strcpy((char *)malloc(strlen(s)+1), s)
-#endif
-
diff --git a/cde/lib/DtHelp/Helpos.c b/cde/lib/DtHelp/Helpos.c
index 91b11ca3..7793e41b 100644
--- a/cde/lib/DtHelp/Helpos.c
+++ b/cde/lib/DtHelp/Helpos.c
@@ -253,38 +253,10 @@ void DtHelpSetCatalogName(
if (catFile == NULL)
{
/* Setup the short and long versions */
-#ifdef __ultrix
- CatFileName = strdup("DtHelp.cat");
-#else
CatFileName = strdup("DtHelp");
-#endif
}
else
- {
-#ifdef __ultrix
-
- /* If we have a full path, just use it */
- if (*catFile == '/')
- CatFileName = strdup(catFile);
- else
- {
- /* We don't have a full path, and the ultirx os needs the
- * ".cat" extention so let's make sure its there.
- */
- if (strcmp(&catFile[strlen(catFile) -4], ".cat") == 0)
- CatFileName = strdup(catFile);
- else
- {
- /* Create our CatFileName with the extention */
- CatFileName = malloc (strlen(catFile) + 5);
- /* +5, 1 for NULL, 4 for ".cat" */
- strcpy(CatFileName, catFile);
- strcat(CatFileName, ".cat");
- }
- }
-
-
-#else
+ {
/* If we have a full path, just use it */
if (*catFile == '/')
@@ -294,7 +266,7 @@ void DtHelpSetCatalogName(
/* hp-ux os does not work with the ".cat" extention, so
* if one exists, remove it.
*/
-
+
if (strcmp(&catFile[strlen(catFile) -4], ".cat") != 0)
CatFileName = strdup(catFile);
else
@@ -306,7 +278,6 @@ void DtHelpSetCatalogName(
CatFileName[len]= '\0';
}
}
-#endif
}
_DtHelpProcessUnlock();
}
@@ -340,22 +311,18 @@ char *_DtHelpGetMessage(
static nl_catd nlmsg_fd;
_DtHelpProcessLock();
- if ( first )
+ if ( first )
{
/* Setup our default message catalog names if none have been set! */
if (CatFileName == NULL)
{
/* Setup the short and long versions */
-#ifdef __ultrix
- CatFileName = strdup("DtHelp.cat");
-#else
CatFileName = strdup("DtHelp");
-#endif
}
-
+
loc = _DtHelpGetLocale();
- if (!loc || !(strcmp (loc, "C")))
+ if (!loc || !(strcmp (loc, "C")))
/*
* If LANG is not set or if LANG=C, then there
* is no need to open the message catalog - just
@@ -367,7 +334,7 @@ char *_DtHelpGetMessage(
first = 0;
}
-
+
msg=catgets(nlmsg_fd,set,n,s);
_DtHelpProcessUnlock();
return (msg);
diff --git a/cde/lib/DtSvc/DtUtil2/DtosP.h b/cde/lib/DtSvc/DtUtil2/DtosP.h
index 0d21a337..fa3c1e82 100644
--- a/cde/lib/DtSvc/DtUtil2/DtosP.h
+++ b/cde/lib/DtSvc/DtUtil2/DtosP.h
@@ -112,9 +112,7 @@ static char SCCSID[] = "OSF/Motif: @(#)_DtosP.h 4.16 91/09/12";
#ifdef BOGUS_MB_MAX /* some systems don't properly set MB_[CUR|LEN]_MAX */
# undef MB_LEN_MAX
-# define MB_LEN_MAX 1 /* temp fix for ultrix */
# undef MB_CUR_MAX
-# define MB_CUR_MAX 1 /* temp fix for ultrix */
#endif /* BOGUS_MB_MAX */
/**********************************************************************/
diff --git a/cde/lib/DtTerm/TermPrim/TermPrimMessageCatI.h b/cde/lib/DtTerm/TermPrim/TermPrimMessageCatI.h
index cafa835a..f03eb251 100644
--- a/cde/lib/DtTerm/TermPrim/TermPrimMessageCatI.h
+++ b/cde/lib/DtTerm/TermPrim/TermPrimMessageCatI.h
@@ -46,7 +46,7 @@
#define NL_SETN_Function 3
#define NL_SETN_Prim 4
#define NL_SETN_PrimRend 5
-#define NL_SETN_View 6
+#define NL_SETN_View 6
#define NL_SETN_ViewGlobalDialog 7
#define NL_SETN_ViewMenu 8
#define NL_SETN_ViewTerminalDialog 9
@@ -54,11 +54,8 @@
#ifndef NO_MESSAGE_CATALOG
extern char *_DtTermPrimGetMessage( char *filename, int set, int n, char *s );
-# ifdef __ultrix
-# define _CLIENT_CAT_NAME "dtterm.cat"
-# else /* __ultrix */
# define _CLIENT_CAT_NAME "dtterm"
-# endif /* __ultrix */
+
# define GETMESSAGE(set, number, string)\
_DtTermPrimGetMessage(_CLIENT_CAT_NAME, set, number, string)
#else
diff --git a/cde/lib/tt/bin/dbck/prop.C b/cde/lib/tt/bin/dbck/prop.C
index 6a5d954c..181ea9b8 100644
--- a/cde/lib/tt/bin/dbck/prop.C
+++ b/cde/lib/tt/bin/dbck/prop.C
@@ -35,10 +35,7 @@
#include <stddef.h>
#include <stdio.h>
#include <errno.h>
-#if defined(ultrix)
-#include <sys/types.h>
-#endif
-#include <sys/stat.h>
+#include <sys/stat.h>
#include "prop.h"
#include "ttdbck.h"
diff --git a/cde/lib/tt/bin/dbck/spec.C b/cde/lib/tt/bin/dbck/spec.C
index 8d6b3492..18bba3fb 100644
--- a/cde/lib/tt/bin/dbck/spec.C
+++ b/cde/lib/tt/bin/dbck/spec.C
@@ -37,10 +37,7 @@
#include <stdio.h>
#include <errno.h>
-#if defined(ultrix)
-#include <sys/types.h>
-#endif
-#include <sys/stat.h>
+#include <sys/stat.h>
#include "spec.h"
#include "options_tt.h"
#include "util/tt_gettext.h"
diff --git a/cde/lib/tt/bin/dbck/spec_repair.C b/cde/lib/tt/bin/dbck/spec_repair.C
index 8924b3e7..47d7b42f 100644
--- a/cde/lib/tt/bin/dbck/spec_repair.C
+++ b/cde/lib/tt/bin/dbck/spec_repair.C
@@ -35,13 +35,10 @@
#include <stddef.h>
#include <stdio.h>
#include <errno.h>
-#if defined(ultrix)
-#include <sys/types.h>
-#endif
#if defined(_AIX)
#include <time.h>
#endif
-#include <sys/stat.h>
+#include <sys/stat.h>
#include "spec.h"
#include "options_tt.h"
#include "ttdbck.h"
diff --git a/cde/lib/tt/bin/shell/mover.C b/cde/lib/tt/bin/shell/mover.C
index cdb18d8a..b0188bc2 100644
--- a/cde/lib/tt/bin/shell/mover.C
+++ b/cde/lib/tt/bin/shell/mover.C
@@ -44,10 +44,6 @@
#endif
#include <stdlib.h>
#include <errno.h>
-#if defined(ultrix)
-#include <sys/inode.h>
-#define S_ISLNK(m) (((m)&IFMT) == IFLNK)
-#endif
#include <sys/stat.h>
#if defined(OPT_BUG_USL)
#define S_ISLNK(mode) (((mode) & S_IFMT) == S_IFLNK)
diff --git a/cde/lib/tt/bin/shell/remover.C b/cde/lib/tt/bin/shell/remover.C
index 0b22558d..c5be4105 100644
--- a/cde/lib/tt/bin/shell/remover.C
+++ b/cde/lib/tt/bin/shell/remover.C
@@ -44,10 +44,6 @@
#endif
#include <stdlib.h>
#include <errno.h>
-#if defined(ultrix)
-#include <sys/inode.h>
-#define S_ISLNK(m) (((m)&IFMT) == IFLNK)
-#endif
#include <sys/stat.h>
#if defined(OPT_BUG_USL)
#define S_ISLNK(mode) (((mode) & S_IFMT) == S_IFLNK)
diff --git a/cde/lib/tt/bin/tt_type_comp/mp_type_comp.C b/cde/lib/tt/bin/tt_type_comp/mp_type_comp.C
index ec9b2b56..a689a704 100644
--- a/cde/lib/tt/bin/tt_type_comp/mp_type_comp.C
+++ b/cde/lib/tt/bin/tt_type_comp/mp_type_comp.C
@@ -66,10 +66,6 @@ extern "C" int getopt(int, char *const *, const char *);
#define _TT_DBCLIENT_SIDE
#include "db/db_server.h"
-#if defined(ultrix)
-extern "C" void xdrstdio_create(XDR *, FILE *, enum xdr_op);
-#endif
-
typedef void (*cmd_fn)();
TT_INSERT_COPYRIGHT
diff --git a/cde/lib/tt/bin/ttdbserverd/dm_server.C b/cde/lib/tt/bin/ttdbserverd/dm_server.C
index cb3adf53..4e659f5a 100644
--- a/cde/lib/tt/bin/ttdbserverd/dm_server.C
+++ b/cde/lib/tt/bin/ttdbserverd/dm_server.C
@@ -20,10 +20,10 @@
* to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
* Floor, Boston, MA 02110-1301 USA
*/
-//%% (c) Copyright 1993, 1994 Hewlett-Packard Company
-//%% (c) Copyright 1993, 1994 International Business Machines Corp.
-//%% (c) Copyright 1993, 1994 Sun Microsystems, Inc.
-//%% (c) Copyright 1993, 1994 Novell, Inc.
+//%% (c) Copyright 1993, 1994 Hewlett-Packard Company
+//%% (c) Copyright 1993, 1994 International Business Machines Corp.
+//%% (c) Copyright 1993, 1994 Sun Microsystems, Inc.
+//%% (c) Copyright 1993, 1994 Novell, Inc.
//%% $TOG: dm_server.C /main/4 1999/10/08 12:01:17 mgreess $
/*
* Tool Talk Database Server - dm_server.C
@@ -77,25 +77,7 @@
#include <fcntl.h>
#include <stdlib.h>
#include <isam.h>
-
-#if defined(ultrix)
-# include <sys/time.h>
-# include <sys/mount.h>
-# include <sys/fs_types.h>
-# define KERNEL
-# include </usr/sys/h/fs_types.h>
-# undef KERNEL
-# define MNTTAB "/etc/fstab"
- const char *TYPE_NFS = "nfs";
- const char *TYPE_LOCAL = "ufs";
- extern "C"
- {
- int getmnt(int *,struct fs_data*, int, int, char*);
- time_t time();
- }
-#else
-# include <time.h>
-#endif
+#include <time.h>
extern "C" { int isaddindex(int, struct keydesc*); }
extern "C" { int isbuild(const char*, int, struct keydesc*, int); }
diff --git a/cde/lib/tt/bin/tttar/tttar_file_utils.C b/cde/lib/tt/bin/tttar/tttar_file_utils.C
index b6b127b3..ac5e0df7 100644
--- a/cde/lib/tt/bin/tttar/tttar_file_utils.C
+++ b/cde/lib/tt/bin/tttar/tttar_file_utils.C
@@ -38,10 +38,6 @@
#include <sys/param.h>
#include <sys/types.h>
#include <sys/stat.h>
-#if defined(ultrix)
-#include <sys/inode.h>
-#define S_ISLNK(m) (((m)&IFMT) == IFLNK)
-#endif
#include <dirent.h>
#include "tttar_utils.h"
#include "tttar_file_utils.h"
diff --git a/cde/lib/tt/lib/api/c/api_xdr.h b/cde/lib/tt/lib/api/c/api_xdr.h
index b2b71d9c..eddbe24f 100644
--- a/cde/lib/tt/lib/api/c/api_xdr.h
+++ b/cde/lib/tt/lib/api/c/api_xdr.h
@@ -41,11 +41,6 @@
#include <rpc/xdr.h>
#include <util/tt_rpc_xdr.h>
-#if defined(ultrix)
-#include <rpc/xdr.h>
-#define bool_t int
-#endif
-
bool_t _tt_xdr_cstring_list(XDR *xdrs, char ***ar);
#endif /* _API_XDR_H */
diff --git a/cde/lib/tt/lib/mp/mp_desktop.h b/cde/lib/tt/lib/mp/mp_desktop.h
index 44f20181..2e58a5b2 100644
--- a/cde/lib/tt/lib/mp/mp_desktop.h
+++ b/cde/lib/tt/lib/mp/mp_desktop.h
@@ -38,17 +38,6 @@
#include <mp/mp_global.h>
#include <util/tt_object.h>
-#if defined(ultrix)
-extern "C"
-{ extern struct XSizeHints;
- extern struct XStandardColormap;
- extern struct XTextProperty;
- extern struct XWMHints;
- extern struct XClassHint;
-};
-#endif
-
-
enum _Tt_dt_type {
_TT_DESKTOP_X11,
_TT_DESKTOP_LAST
diff --git a/cde/lib/tt/lib/mp/mp_rpc.h b/cde/lib/tt/lib/mp/mp_rpc.h
index 2a4ef014..495c3ad4 100644
--- a/cde/lib/tt/lib/mp/mp_rpc.h
+++ b/cde/lib/tt/lib/mp/mp_rpc.h
@@ -45,7 +45,7 @@
# undef __SVR4_I386_ABI_L1__
#endif
-#if defined(ultrix) || defined(_AIX)
+#if defined(_AIX)
extern "C" {
void svcerr_auth (SVCXPRT *, enum auth_stat);
SVCXPRT *svcfd_create(int,int,int);
diff --git a/cde/lib/tt/lib/mp/mp_rpc_client.C b/cde/lib/tt/lib/mp/mp_rpc_client.C
index 29a5d2da..c65a7952 100644
--- a/cde/lib/tt/lib/mp/mp_rpc_client.C
+++ b/cde/lib/tt/lib/mp/mp_rpc_client.C
@@ -31,7 +31,6 @@
*
* Copyright (c) 1990 by Sun Microsystems, Inc.
*/
-#include <sys/time.h> // ultrix
#include <stdio.h>
#include <signal.h>
#include <errno.h>
@@ -50,16 +49,6 @@
#include "util/tt_host.h"
#include "util/tt_port.h"
-#if defined(ultrix)
-extern "C"
-{ extern struct XSizeHints;
- extern struct XStandardColormap;
- extern struct XTextProperty;
- extern struct XWMHints;
- extern struct XClassHint;
-};
-#endif
-
#if defined(_AIX)
/* AIX's FD_ZERO macro uses bzero() without declaring it. */
#include <strings.h>
diff --git a/cde/lib/tt/lib/mp/mp_session.C b/cde/lib/tt/lib/mp/mp_session.C
index b66f4e1b..05d186cb 100644
--- a/cde/lib/tt/lib/mp/mp_session.C
+++ b/cde/lib/tt/lib/mp/mp_session.C
@@ -145,7 +145,7 @@ c_open_unix_socket(char *socket_name)
memset(&server_addr, 0, sizeof(server_addr));
server_addr.sun_family = AF_UNIX;
strcpy(server_addr.sun_path, socket_name);
-#if defined(ultrix) || defined(_AIX) || defined(hpux) || defined(__osf__)
+#if defined(_AIX) || defined(hpux) || defined(__osf__)
int servlen = strlen(server_addr.sun_path) + sizeof(server_addr.sun_fam\
ily);
if (connect(sock, (sockaddr *)&server_addr, servlen) < 0) {
diff --git a/cde/lib/tt/lib/mp/mp_stream_socket.C b/cde/lib/tt/lib/mp/mp_stream_socket.C
index 751706d9..1dbea648 100644
--- a/cde/lib/tt/lib/mp/mp_stream_socket.C
+++ b/cde/lib/tt/lib/mp/mp_stream_socket.C
@@ -60,10 +60,6 @@
#include <sys/time.h>
-#if defined(ultrix)
-extern "C" unsigned long inet_addr(char *);
-#endif
-
#include <arpa/inet.h>
#if defined(OPT_BUG_USL)
diff --git a/cde/lib/tt/lib/realpath.ultrix.c b/cde/lib/tt/lib/realpath.ultrix.c
deleted file mode 100644
index 576806f3..00000000
--- a/cde/lib/tt/lib/realpath.ultrix.c
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * CDE - Common Desktop Environment
- *
- * Copyright (c) 1993-2012, The Open Group. All rights reserved.
- *
- * These libraries and programs are free software; you can
- * redistribute them and/or modify them under the terms of the GNU
- * Lesser General Public License as published by the Free Software
- * Foundation; either version 2 of the License, or (at your option)
- * any later version.
- *
- * These libraries and programs are distributed in the hope that
- * they will be useful, but WITHOUT ANY WARRANTY; without even the
- * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- * PURPOSE. See the GNU Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with these libraries and programs; if not, write
- * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
- * Floor, Boston, MA 02110-1301 USA
- */
-/*%% (c) Copyright 1993, 1994 Hewlett-Packard Company */
-/*%% (c) Copyright 1993, 1994 International Business Machines Corp. */
-/*%% (c) Copyright 1993, 1994 Sun Microsystems, Inc. */
-/*%% (c) Copyright 1993, 1994 Novell, Inc. */
-/*%% $XConsortium: realpath.ultrix.c /main/3 1995/10/23 09:50:04 rswiston $ */
-
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/param.h>
-#include <strings.h>
-
-char *
-realpath(pathname, finalpath)
-char *pathname;
-char *finalpath;
-{
- struct stat sbuf;
- char curpath[MAXPATHLEN],
- workpath[MAXPATHLEN],
- linkpath[MAXPATHLEN],
- namebuf[MAXPATHLEN],
- *where,
- *ptr,
- *last;
- int len;
-
- strcpy(curpath, pathname);
-
- if (*pathname != '/') {
-#if defined(__STDC__) && defined(hp)
- if (!getcwd(workpath)) {
-#else
- if (!getwd(workpath)) {
-#endif
- strcpy(finalpath, ".");
- return(NULL);
- }
- } else *workpath = NULL;
-
- /* curpath is the path we're still resolving */
- /* linkpath is the path a symbolic link points to */
- /* workpath is the path we've resolved */
-
- loop:
- where = curpath;
- while (*where != NULL) {
- if (!strcmp(where, ".")) {
- where++;
- continue;
- }
-
- /* deal with "./" */
- if (!strncmp(where, "./", 2)) {
- where += 2;
- continue;
- }
-
- /* deal with "../" */
- if (!strncmp(where, "../", 3)) {
- where += 3;
- ptr = last = workpath;
- while (*ptr) {
- if (*ptr == '/') last = ptr;
- ptr++;
- }
- *last = NULL;
- continue;
- }
-
- ptr = strchr(where, '/');
- if (!ptr)
- ptr = where + strlen(where) - 1;
- else
- *ptr = NULL;
-
- strcpy(namebuf, workpath);
- for (last = namebuf; *last; last++) continue;
- /* tack on a trailing, or leading, `/` */
- if (last == namebuf || *--last != '/') {
- strcat(namebuf, "/");
- }
- strcat(namebuf, where);
-
- where = ++ptr;
- if (lstat(namebuf, &sbuf) == -1) {
- strcpy(finalpath, namebuf);
- return(NULL);
- }
-
- if ((sbuf.st_mode & S_IFLNK) == S_IFLNK) {
- len = readlink(namebuf, linkpath, MAXPATHLEN);
- if (len == 0) {
- strcpy(finalpath, namebuf);
- return(NULL);
- }
- *(linkpath + len) = NULL; /* readlink doesn't null-terminate result */
- if (*linkpath == '/') *workpath = NULL;
- if (*where) {
- strcat(linkpath, "/");
- strcat(linkpath, where);
- }
- strcpy(curpath, linkpath);
- goto loop;
- }
-
- if ((sbuf.st_mode & S_IFDIR) == S_IFDIR) {
- strcpy(workpath, namebuf);
- continue;
- }
-
- if (*where) {
- strcpy(finalpath, namebuf);
- return(NULL); /* path/notadir/morepath */
- } else
- strcpy(workpath, namebuf);
- }
- strcpy(finalpath, workpath);
- return(finalpath);
-
-}
-
diff --git a/cde/lib/tt/lib/tt_options.h b/cde/lib/tt/lib/tt_options.h
index d4a4e93a..52b5695a 100644
--- a/cde/lib/tt/lib/tt_options.h
+++ b/cde/lib/tt/lib/tt_options.h
@@ -344,17 +344,6 @@
# undef OPT_GARBAGE_THREADS
# endif
-#elif defined(ultrix)
-
-# undef OPT_UNIX_SOCKET_RPC
-# undef OPT_TLI
-# undef OPT_DLOPEN_X11
-# undef OPT_DLOPEN_CE
-# undef OPT_ADDMSG_DIRECT
-# undef OPT_SECURE_RPC
-# undef OPT_CLASSING_ENGINE
-# undef OPT_TAR_HAS_EXCLUDE_OPTION
-
#elif defined(__hpux) || defined(hpux)
# undef OPT_UNIX_SOCKET_RPC
diff --git a/cde/lib/tt/lib/util/tt_int_rec.C b/cde/lib/tt/lib/util/tt_int_rec.C
index 080ab6ad..15778294 100644
--- a/cde/lib/tt/lib/util/tt_int_rec.C
+++ b/cde/lib/tt/lib/util/tt_int_rec.C
@@ -33,9 +33,6 @@
*/
#include "util/tt_int_rec.h"
#include "util/tt_iostream.h"
-#if defined(ultrix)
-#include <rpc/types.h>
-#endif
_Tt_int_rec::
_Tt_int_rec()
diff --git a/cde/lib/tt/lib/util/tt_int_rec.h b/cde/lib/tt/lib/util/tt_int_rec.h
index 9cc374d5..b8bffc26 100644
--- a/cde/lib/tt/lib/util/tt_int_rec.h
+++ b/cde/lib/tt/lib/util/tt_int_rec.h
@@ -35,11 +35,8 @@
#define TT_INT_REC_H
#include <util/tt_object.h>
#include <util/tt_list.h>
-#if defined(ultrix)
-#include <rpc/types.h>
-#endif
-/*
+/*
* _Tt_int_rec is essentially just a wrapper around an integer so we can
* have lists of integers (which isn't allowed in the implementation of
* the list utility).
diff --git a/cde/lib/tt/lib/util/tt_new.h b/cde/lib/tt/lib/util/tt_new.h
index b734b5bd..a50469be 100644
--- a/cde/lib/tt/lib/util/tt_new.h
+++ b/cde/lib/tt/lib/util/tt_new.h
@@ -41,10 +41,6 @@
#include <sys/types.h>
#endif /* __STDC__ */
#include <stdlib.h>
-#if defined(ultrix)
-#include <rpc/types.h>
-#define bool_t int
-#endif
#if defined(sun)
# define MALLOCTYPE char
#else
diff --git a/cde/lib/tt/lib/util/tt_new_ptr.h b/cde/lib/tt/lib/util/tt_new_ptr.h
index 9101512f..7adaf36e 100644
--- a/cde/lib/tt/lib/util/tt_new_ptr.h
+++ b/cde/lib/tt/lib/util/tt_new_ptr.h
@@ -42,10 +42,6 @@
#include "util/tt_generic.h"
#include "util/tt_new.h"
-#if defined(ultrix)
-#include <rpc/types.h>
-#endif
-
class _Tt_object;
class _Tt_new_ptr : public _Tt_allocated {
protected:
diff --git a/cde/lib/tt/lib/util/tt_object.h b/cde/lib/tt/lib/util/tt_object.h
index 03ec24f3..8c0df61d 100644
--- a/cde/lib/tt/lib/util/tt_object.h
+++ b/cde/lib/tt/lib/util/tt_object.h
@@ -34,9 +34,6 @@
#ifndef _TT_OBJECT_H
#define _TT_OBJECT_H
#include "util/tt_ptr.h"
-#if defined(ultrix)
-#include <rpc/types.h>
-#endif
declare_ptr_to(_Tt_object)
diff --git a/cde/lib/tt/lib/util/tt_object_list.h b/cde/lib/tt/lib/util/tt_object_list.h
index 2ba5b4e8..736a4878 100644
--- a/cde/lib/tt/lib/util/tt_object_list.h
+++ b/cde/lib/tt/lib/util/tt_object_list.h
@@ -41,10 +41,6 @@
# undef remove
#endif
-#if defined(ultrix)
-#include <rpc/types.h>
-#endif
-
class _Tt_object_list_element;
class _Tt_object_list_ptr;
class _Tt_object_list: public _Tt_object {
diff --git a/cde/lib/tt/lib/util/tt_string.C b/cde/lib/tt/lib/util/tt_string.C
index 5b5c4f32..49454e40 100644
--- a/cde/lib/tt/lib/util/tt_string.C
+++ b/cde/lib/tt/lib/util/tt_string.C
@@ -49,9 +49,6 @@
#include <string.h>
#include <memory.h>
-#if defined(ultrix)
-#include <rpc/types.h>
-#endif
#include <stdlib.h>
#include <ctype.h>
#if defined(linux) || defined(CSRG_BASED) || defined(sun)
diff --git a/cde/lib/tt/lib/util/tt_string.h b/cde/lib/tt/lib/util/tt_string.h
index 1ec63d34..74812667 100644
--- a/cde/lib/tt/lib/util/tt_string.h
+++ b/cde/lib/tt/lib/util/tt_string.h
@@ -61,9 +61,6 @@ extern "C" {
#include "util/tt_list.h"
#include "util/tt_object.h"
#include <memory.h>
-#if defined(ultrix)
-#define bool_t int
-#endif
const int _Tt_string_unlimited = -1;
const int _Tt_string_user_width = -2;
diff --git a/cde/lib/tt/lib/util/tt_xdr_utils.C b/cde/lib/tt/lib/util/tt_xdr_utils.C
index 938f7951..be65276e 100644
--- a/cde/lib/tt/lib/util/tt_xdr_utils.C
+++ b/cde/lib/tt/lib/util/tt_xdr_utils.C
@@ -20,21 +20,17 @@
* to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
* Floor, Boston, MA 02110-1301 USA
*/
-//%% (c) Copyright 1993, 1994 Hewlett-Packard Company
-//%% (c) Copyright 1993, 1994 International Business Machines Corp.
-//%% (c) Copyright 1993, 1994 Sun Microsystems, Inc.
-//%% (c) Copyright 1993, 1994 Novell, Inc.
-//%% $XConsortium: tt_xdr_utils.C /main/6 1996/08/29 18:08:20 drk $
+//%% (c) Copyright 1993, 1994 Hewlett-Packard Company
+//%% (c) Copyright 1993, 1994 International Business Machines Corp.
+//%% (c) Copyright 1993, 1994 Sun Microsystems, Inc.
+//%% (c) Copyright 1993, 1994 Novell, Inc.
+//%% $XConsortium: tt_xdr_utils.C /main/6 1996/08/29 18:08:20 drk $
/*
*
* tt_xdr_utils.cc
*
* Copyright (c) 1990 by Sun Microsystems, Inc.
*/
-#if defined(ultrix)
-#include <rpc/types.h>
-#define bool_t int
-#endif
#include <rpc/rpc.h>
#include <util/tt_xdr_utils.h>
#include <memory.h>
@@ -80,7 +76,7 @@ tt_x_putbytes(XDR *xp, caddr_t, int len)
return TRUE;
}
-#if defined(ultrix) || defined(__osf__)
+#if defined(__osf__)
static int*
#elif defined(CSRG_BASED)
static int32_t*
@@ -103,7 +99,7 @@ tt_x_inline(XDR *xp, int len)
*/
if (len > 0 && (caddr_t) len < xp->x_base) {
xp->x_handy += RNDUP (len);
-#if defined(ultrix) || defined(__osf__)
+#if defined(__osf__)
return (int *) xp->x_private;
#elif defined(CSRG_BASED)
return (int32_t *) xp->x_private;
diff --git a/cde/lib/tt/mini_isam/isalloc.c b/cde/lib/tt/mini_isam/isalloc.c
index 765e7ec2..0a24418d 100644
--- a/cde/lib/tt/mini_isam/isalloc.c
+++ b/cde/lib/tt/mini_isam/isalloc.c
@@ -43,13 +43,6 @@ static char sccsid[] = "@(#)isalloc.c 1.3 89/07/17 Copyr 1988 Sun Micro";
#include "isam_impl.h"
#include <stdlib.h>
-/* strdup is not defined in Ultrix' string.h, so it is implemented in a separate
- * file named strdup.ultrix.c
- */
-#ifdef __ultrix__
-extern char *strdup();
-#endif
-
/*
* _ismalloc(nbytes)
*
diff --git a/cde/lib/tt/mini_isam/iserror.c b/cde/lib/tt/mini_isam/iserror.c
index e07b5b4c..9f96d75e 100644
--- a/cde/lib/tt/mini_isam/iserror.c
+++ b/cde/lib/tt/mini_isam/iserror.c
@@ -44,9 +44,6 @@ static char sccsid[] = "@(#)iserror.c 1.10 89/07/17 Copyr 1988 Sun Micro";
#include <errno.h>
#include <stdlib.h>
#include <syslog.h>
-#ifdef __ultrix__
-#define LOG_USER LOG_INFO
-#endif
/*
* _isfatal_error(msg)
*
@@ -55,7 +52,7 @@ static char sccsid[] = "@(#)iserror.c 1.10 89/07/17 Copyr 1988 Sun Micro";
static int (*fatal_error_user_handler)(); /* set by iscntl(..,ISCNTL_FATAL,..) */
-void
+void
_isfatal_error(char *msg)
{
int logerr;
diff --git a/cde/lib/tt/mini_isam/strdup.ultrix.c b/cde/lib/tt/mini_isam/strdup.ultrix.c
deleted file mode 100644
index 934fe9c2..00000000
--- a/cde/lib/tt/mini_isam/strdup.ultrix.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * CDE - Common Desktop Environment
- *
- * Copyright (c) 1993-2012, The Open Group. All rights reserved.
- *
- * These libraries and programs are free software; you can
- * redistribute them and/or modify them under the terms of the GNU
- * Lesser General Public License as published by the Free Software
- * Foundation; either version 2 of the License, or (at your option)
- * any later version.
- *
- * These libraries and programs are distributed in the hope that
- * they will be useful, but WITHOUT ANY WARRANTY; without even the
- * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- * PURPOSE. See the GNU Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with these libraries and programs; if not, write
- * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
- * Floor, Boston, MA 02110-1301 USA
- */
-/*%% (c) Copyright 1993, 1994 Hewlett-Packard Company */
-/*%% (c) Copyright 1993, 1994 International Business Machines Corp. */
-/*%% (c) Copyright 1993, 1994 Sun Microsystems, Inc. */
-/*%% (c) Copyright 1993, 1994 Novell, Inc. */
-/*%% $XConsortium: strdup.ultrix.c /main/3 1995/10/23 11:46:57 rswiston $ */
-/* strdup - make duplicate of string s */
-#include <string.h>
-#include <malloc.h>
-
-char *
-strdup(char *s)
-{
- char *p;
-
- p = (char *)malloc(strlen(s) + 1); /* + 1 for '\0' character */
- if (p != NULL)
- strcpy(p,s);
- return p;
-}
diff --git a/cde/lib/tt/slib/mp_s_procid.C b/cde/lib/tt/slib/mp_s_procid.C
index 44d92f0c..fb8a2cce 100644
--- a/cde/lib/tt/slib/mp_s_procid.C
+++ b/cde/lib/tt/slib/mp_s_procid.C
@@ -948,7 +948,7 @@ signal_new_message(_Tt_message_ptr &m)
#if defined(sun) && defined(SVR4)
typedef int (*Xdrrec_reader)(...);
typedef int (*Xdrrec_writer)(...);
-#elif defined(sun) & !defined(SVR4) || defined(ultrix)
+#elif defined(sun) & !defined(SVR4)
typedef int (*Xdrrec_reader)();
typedef int (*Xdrrec_writer)();
#else
diff --git a/cde/lib/tt/slib/mp_s_session.C b/cde/lib/tt/slib/mp_s_session.C
index e230476b..c876c758 100644
--- a/cde/lib/tt/slib/mp_s_session.C
+++ b/cde/lib/tt/slib/mp_s_session.C
@@ -20,11 +20,11 @@
* to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
* Floor, Boston, MA 02110-1301 USA
*/
-//%% (c) Copyright 1993, 1994 Hewlett-Packard Company
-//%% (c) Copyright 1993, 1994 International Business Machines Corp.
-//%% (c) Copyright 1993, 1994 Sun Microsystems, Inc.
-//%% (c) Copyright 1993, 1994 Novell, Inc.
-//%% $TOG: mp_s_session.C /main/6 1999/09/10 19:15:11 mgreess $
+//%% (c) Copyright 1993, 1994 Hewlett-Packard Company
+//%% (c) Copyright 1993, 1994 International Business Machines Corp.
+//%% (c) Copyright 1993, 1994 Sun Microsystems, Inc.
+//%% (c) Copyright 1993, 1994 Novell, Inc.
+//%% $TOG: mp_s_session.C /main/6 1999/09/10 19:15:11 mgreess $
/*
* mp_s_session.C 1.25 29 Jul 1993
*
@@ -53,7 +53,7 @@
#include <unistd.h>
#include "util/tt_port.h"
-#include <X11/Xlib.h>
+#include <X11/Xlib.h>
#ifdef OPT_UNIX_SOCKET_RPC
# include <sys/socket.h>
@@ -64,25 +64,25 @@
// Use the parent class (_Tt_session) for construction and destruction.
_Tt_s_session::_Tt_s_session () {}
-_Tt_s_session::~_Tt_s_session ()
+_Tt_s_session::~_Tt_s_session ()
{
#ifdef OPT_UNIX_SOCKET_RPC
if (_socket_name.len()) {
- // A UNIX domain socket that was bound to a pathname
- // and therefore must be removed by the owner when the session
- // server exits. This ensures that when the next session
+ // A UNIX domain socket that was bound to a pathname
+ // and therefore must be removed by the owner when the session
+ // server exits. This ensures that when the next session
// server starts, it can choose the same pathname and bind
- // to it. The pathname cannot refer to a file existing
+ // to it. The pathname cannot refer to a file existing
// on the system.
(void)unlink(_socket_name);
}
#endif // OPT_UNIX_SOCKET_RPC
}
-//
+//
// Callback for i/o errors detected for the desktop session. The default
// action is to exit immediately.
-//
+//
int
_tt_xio_handler(Display * /* xdisp */)
{
@@ -92,14 +92,14 @@ _tt_xio_handler(Display * /* xdisp */)
#ifdef OPT_UNIX_SOCKET_RPC
-//
+//
// Utility routine to open a unix domain socket and bind it to the given
// socket name.
-//
+//
// XXX: It would be more elegant to add unix domain support to the
// _Tt_stream_socket class rather than have these special routines for
// dealing with them.
-//
+//
static int
s_open_unix_socket(char *socket_name)
{
@@ -115,7 +115,7 @@ s_open_unix_socket(char *socket_name)
server_addr.sun_family = AF_UNIX;
(void)unlink(socket_name);
strcpy(server_addr.sun_path, socket_name);
-#if defined(ultrix) || defined(_AIX) || defined(hpux) || defined(__osf__)
+#if defined(_AIX) || defined(hpux) || defined(__osf__)
int servlen = strlen(server_addr.sun_path) + sizeof(server_addr.sun_fam\
ily);
if (bind(sock, (struct sockaddr *)&server_addr,servlen) < 0) {
@@ -133,13 +133,13 @@ ily);
}
-//
+//
// Called in response to a client request for a new rpc connection. We
// accept the connection on the unix socket and then use the standard
// _Tt_rpc_server object, which acts accordingly if given an open file
// descriptor in its constructor (see that method for more details) to
// open the rpc connection.
-//
+//
void _Tt_s_session::
u_rpc_init()
{
@@ -157,12 +157,12 @@ u_rpc_init()
_auth);
if (! server_object->init(_tt_service_rpc)) {
_tt_syslog(0, LOG_ERR, "u_rpc_init: server_object->init(): 0");
- }
+ }
}
#endif // OPT_UNIX_SOCKET_RPC
-//
+//
// This is the server-side init routine for the _Tt_session object. The
// basic duties for this method are to advertise the server address
// accordingly after initializing the rpc server object. If we are in a
@@ -173,7 +173,7 @@ u_rpc_init()
// TT_OK
// TT_ERR_SESSION Found a live session (diagnostic has been emitted)
// TT_ERR_NOMP Could not initialize (diagnostic has been emitted)
-//
+//
Tt_status _Tt_s_session::
s_init()
{
@@ -228,7 +228,7 @@ s_init()
_server_uid = getuid();
_queued_messages = new _Tt_message_list();
_properties = new _Tt_session_prop_list;
-
+
// Create an RPC server managing object which will
// invoke the appropiate dispatch function on any RPC
// requests. This object also allocates an RPC program
@@ -237,9 +237,9 @@ s_init()
_rpc_server = new _Tt_rpc_server(RPC_ANYSOCK,
TT_RPC_VERSION,
RPC_ANYSOCK,
- _auth);
-
- if (! _rpc_server->init(_tt_service_rpc)) {
+ _auth);
+
+ if (! _rpc_server->init(_tt_service_rpc)) {
return(TT_ERR_NOMP);
}
_rpc_program = _rpc_server->program();
@@ -247,7 +247,7 @@ s_init()
// initializes our local host object which allows us to
// inquire our host address so we can then advertise it to
- // clients.
+ // clients.
if (! _tt_global->get_local_host(_host)) {
_tt_syslog(0, LOG_ERR,"get_local_host(): 0");
return(TT_ERR_NOMP);
@@ -286,21 +286,21 @@ s_init()
}
-//
+//
// Used to check whether there is already a live session. Only desktop
// sessions need this check since process-tree sessions are always unique
-// since they are based on the process hierarchy.
-//
+// since they are based on the process hierarchy.
+//
// XXX: If the range of environments were to be extended to more than
// just desktop and process-tree sessions we would need more abstract
// methods for session environments that return whether this check is
-// necessary.
+// necessary.
//
// Returns:
// TT_OK Found no session
// TT_ERR_SESSION Found a live session (diagnostic emitted)
// TT_ERR_NOMP Found a dead session (diagnostic emitted)
-//
+//
Tt_status _Tt_s_session::
check_for_live_session()
{
@@ -315,8 +315,8 @@ check_for_live_session()
// try to find the address of an advertised session
if (find_advertised_address(rsession._address_string) == TT_OK) {
// found another server id, check to see that it's
- // running.
-
+ // running.
+
rsession._desktop = _desktop;
rsession._displayname = _displayname;
status = rsession.client_session_init();
@@ -373,31 +373,14 @@ check_for_live_session()
return(TT_ERR_INTERNAL);
}
}
-
- return(TT_OK);
-}
-
-#if defined(ultrix)
-/* strdup - make duplicate of string s */
-#include <string.h>
-#include <malloc.h>
-
-static char *
-strdup(char *s)
-{
- char *p;
- p = (char *)malloc(strlen(s) + 1); /* + 1 for '\0' character */
- if (p != NULL)
- strcpy(p,s);
- return p;
+ return(TT_OK);
}
-#endif
-//
+//
// Advertises a session procid so that any clients that come up within
// the appropiate domain will find the session id.
-//
+//
Tt_status _Tt_s_session::
advertise_address()
{
@@ -405,7 +388,7 @@ advertise_address()
_Tt_string prop(TT_XATOM_NAME);
_Tt_string cde_prop(TT_CDE_XATOM_NAME);
_Tt_string xdisp("DISPLAY");
-
+
switch(env()) {
case _TT_ENV_X11:
// advertise our address by setting a special property
@@ -433,23 +416,23 @@ advertise_address()
}
-//
+//
// This function is called to notify the session object that a new
// pattern has been registered by some procid. This means that for any
// queued messages, there may now be a procid that is suitable to receive
// the message so this function iterates through all the queued messages
// attempting to deliver the message.
-//
+//
// XXX: For efficiency, this method might take an argument which is the
// new pattern and then delivery of the queued messages could be
// restricted to just matching against the new pattern.
-//
+//
void _Tt_s_session::
pattern_added()
{
_Tt_message_list_cursor qmsgs;
_Tt_s_message *sm;
-
+
/* try to deliver session queued msgs */
qmsgs.reset(_queued_messages);
while (qmsgs.next()) {
@@ -468,12 +451,12 @@ pattern_added()
}
-//
+//
// The given procid wishes to join this session. We iterate through the
// procid's patterns and add our session id to them. We also invoke the
// pattern_added method since we may have an opportunity to deliver more
// queued messages.
-//
+//
Tt_status _Tt_s_session::
s_join(_Tt_s_procid_ptr &procid)
{
@@ -483,24 +466,24 @@ s_join(_Tt_s_procid_ptr &procid)
if (procid->is_active()) {
// we've altered the patterns registered so we call
// pattern_added() to attempt delivery of any
- // queued messages.
+ // queued messages.
pattern_added();
}
return(TT_OK);
}
-//
+//
// For each pattern in patterns that is session-scoped, this method will
// add or delete (depending on add parameter) this session's id to the
// session list for the pattern.
-//
+//
void _Tt_s_session::
mod_session_id_in_patterns(_Tt_pattern_list_ptr &patterns, int add)
{
_Tt_pattern_list_cursor pcursor;
int scopes;
-
+
pcursor.reset(patterns);
while (pcursor.next()) {
scopes = pcursor->scopes();
@@ -511,13 +494,13 @@ mod_session_id_in_patterns(_Tt_pattern_list_ptr &patterns, int add)
pcursor->add_session(address_string());
// set special pattern flag to
// optimize session-scoped pattern
- // matching.
+ // matching.
pcursor->set_in_session();
} else {
pcursor->del_session(address_string());
// clear special pattern flag to
// optimize session-scoped pattern
- // matching.
+ // matching.
pcursor->clr_in_session();
}
}
@@ -525,23 +508,23 @@ mod_session_id_in_patterns(_Tt_pattern_list_ptr &patterns, int add)
}
-//
+//
// The given procid wishes to quit this session. We remove our session id
// from the procid's patterns.
-//
+//
Tt_status _Tt_s_session::
s_quit(_Tt_s_procid_ptr &procid)
{
// delete session from handler patterns
mod_session_id_in_patterns(procid->patterns(), 0);
-
+
return(TT_OK);
}
-//
+//
// Adds a message to the queue of session-queued messages.
-//
+//
void _Tt_s_session::
queue_message(_Tt_message_ptr &m)
{
@@ -553,7 +536,7 @@ queue_message(_Tt_message_ptr &m)
_Tt_message_list_cursor qm;
Tt_state qm_state;
_Tt_string qm_ptype;
-
+
// verify that only one message with m's id and handler_ptype
// exists in the queue (in the same state as m)
qm.reset(_queued_messages);
diff --git a/cde/lib/tt/slib/mp_typedb.C b/cde/lib/tt/slib/mp_typedb.C
index 3834d212..1f795f93 100644
--- a/cde/lib/tt/slib/mp_typedb.C
+++ b/cde/lib/tt/slib/mp_typedb.C
@@ -73,11 +73,6 @@
#include "util/tt_global_env.h"
#include "util/tt_xdr_version.h"
-#if defined(ultrix)
-extern "C" void xdrstdio_create(XDR *, FILE *, enum xdr_op);
-#endif
-
-
enum _Tt_typedb_flags {
_TT_TYPEDB_USER,
_TT_TYPEDB_SYSTEM,
diff --git a/cde/lib/tt/slib/mp_typedb.h b/cde/lib/tt/slib/mp_typedb.h
index 36d6742d..5fff05dc 100644
--- a/cde/lib/tt/slib/mp_typedb.h
+++ b/cde/lib/tt/slib/mp_typedb.h
@@ -25,7 +25,7 @@
/*%% (c) Copyright 1993, 1994 Sun Microsystems, Inc. */
/*%% (c) Copyright 1993, 1994 Novell, Inc. */
/*%% $XConsortium: mp_typedb.h /main/3 1995/10/23 12:02:24 rswiston $ */
-/*
+/*
* @(#)mp_typedb.h 1.25 @(#)
* mp_typedb.h
*
@@ -33,9 +33,6 @@
*/
#ifndef _MP_TYPEDB_H
#define _MP_TYPEDB_H
-#if defined(ultrix)
-#include <sys/types.h>
-#endif
#include <sys/stat.h>
#include "util/tt_object.h"
diff --git a/cde/programs/dtaction/Main.c b/cde/programs/dtaction/Main.c
index 68ed1645..b4ddf98a 100644
--- a/cde/programs/dtaction/Main.c
+++ b/cde/programs/dtaction/Main.c
@@ -137,11 +137,7 @@ XtResource resources[] =
*/
#ifndef NO_MESSAGE_CATALOG
-# ifdef __ultrix
-# define _CLIENT_CAT_NAME "dtact.cat"
-# else /* __ultrix */
# define _CLIENT_CAT_NAME "dtact"
-# endif /* __ultrix */
extern char *_DtGetMessage(char *filename, int set, int n, char *s);
# define GETMESSAGE(set, number, string)\
(_DtGetMessage(_CLIENT_CAT_NAME, set, number, string))
@@ -150,7 +146,7 @@ extern char *_DtGetMessage(char *filename, int set, int n, char *s);
string
#endif
-Boolean _DtWmStringsAreEqual(
+Boolean _DtWmStringsAreEqual(
register char *in_str,
register char *test_str) ;
void CheckForDone(
diff --git a/cde/programs/dtcalc/calctool.h b/cde/programs/dtcalc/calctool.h
index 480ad92a..799f5d1c 100644
--- a/cde/programs/dtcalc/calctool.h
+++ b/cde/programs/dtcalc/calctool.h
@@ -62,11 +62,7 @@ extern char *MSGFILE_MESSAGE ;
#define bindtextdomain(f, s)
#ifndef NO_MESSAGE_CATALOG
-# ifdef __ultrix
-# define _CLIENT_CAT_NAME "dtcalc.cat"
-# else /* __ultrix */
# define _CLIENT_CAT_NAME "dtcalc"
-# endif /* __ultrix */
extern char *_DtGetMessage(char *filename, int set, int n, char *s);
# define GETMESSAGE(set, number, string)\
(_DtGetMessage(_CLIENT_CAT_NAME, set, number, string))
diff --git a/cde/programs/dtdocbook/instant/README b/cde/programs/dtdocbook/instant/README
index 35f3c322..969f69f3 100644
--- a/cde/programs/dtdocbook/instant/README
+++ b/cde/programs/dtdocbook/instant/README
@@ -55,7 +55,6 @@ Also required
Platforms tried on
OSF1 1.3 (i486)
- Ultrix 4.2 (mips)
HP-UX 9.01 (hp 9000/700)
AIX 3.2 (rs6000)
SunOS [missing strerror()]
diff --git a/cde/programs/dtdocbook/instant/general.h b/cde/programs/dtdocbook/instant/general.h
index c2f360e8..217bb877 100644
--- a/cde/programs/dtdocbook/instant/general.h
+++ b/cde/programs/dtdocbook/instant/general.h
@@ -323,10 +323,3 @@ void PrintElemSummary(Element_t *);
void PrintElemTree(Element_t *);
void PrintStats(Element_t *);
void PrintIDList();
-
-/* ----- other declarations ----- */
-
-#ifdef ultrix
-#define strdup(s) strcpy((char *)malloc(strlen(s)+1), s)
-#endif
-
diff --git a/cde/programs/dtfile/FileManip.c b/cde/programs/dtfile/FileManip.c
index 73c30bc1..05aae3ee 100644
--- a/cde/programs/dtfile/FileManip.c
+++ b/cde/programs/dtfile/FileManip.c
@@ -94,17 +94,11 @@
#include <ufs/fs.h>
#include <sys/access.h>
#else
-#ifdef __ultrix
-#include <unistd.h>
-#include <limits.h>
-#include <ufs/fs.h>
-#else
#include <unistd.h>
#include <limits.h>
#ifdef __hpux
#include <unistd.h>
#endif
-#endif /* __ultrix */
#endif /* __hp_osf */
#endif /* sun */
@@ -154,9 +148,9 @@ CheckAccess(
uid_t save_ruid;
gid_t save_rgid;
-#if defined(__hp_osf) || defined(__ultrix)
+#if defined(__hp_osf)
/*--------------------------------------------------------------------
- * access code for __hp_osf, __ultrix
+ * access code for __hp_osf
*------------------------------------------------------------------*/
setreuid(geteuid(),-1);
@@ -995,7 +989,7 @@ FileManip(
if (lstat (to, &s2) >= 0) /* <to> exists */
{
if ((stat (to, &s3) >= 0) &&
-#if defined(__hp_osf) || (__ultrix) || defined(__osf__) || defined(linux) || \
+#if defined(__hp_osf) || defined(__osf__) || defined(linux) || \
defined(CSRG_BASED)
(((s3.st_mode & S_IFMT) == S_IFDIR) /* if is a directory */
|| ((s3.st_mode & S_IFMT) == S_IFSOCK)) ) /* or a net special */
diff --git a/cde/programs/dtfile/FileMgr.c b/cde/programs/dtfile/FileMgr.c
index 89c055d6..87ae8039 100644
--- a/cde/programs/dtfile/FileMgr.c
+++ b/cde/programs/dtfile/FileMgr.c
@@ -1667,14 +1667,6 @@ SetValues(
file_mgr_data->file_mgr_rec = (XtPointer) file_mgr_rec;
- /* this is what we did for the ultrix port to get the name of the
- Application dir right, BUT it has some bugs */
- if(file_mgr_data->title != NULL)
- {
- XtSetArg (args[0], XmNtitle, file_mgr_data->title);
- XtSetValues(file_mgr_rec->shell, args, 1);
- }
-
/* Set up the callbacks for the current directory line only if
not in showFilesystem. */
diff --git a/cde/programs/dtfile/Find.c b/cde/programs/dtfile/Find.c
index f9928f8c..da61adfb 100644
--- a/cde/programs/dtfile/Find.c
+++ b/cde/programs/dtfile/Find.c
@@ -1815,7 +1815,7 @@ ExecuteFind(
if (access_priv == -1 && geteuid() != root_user)
{
#else
-# if defined(__hp_osf) || defined(__ultrix) || defined(__osf__) || defined(linux) || defined(CSRG_BASED)
+# if defined(__hp_osf) || defined(__osf__) || defined(linux) || defined(CSRG_BASED)
setreuid(geteuid(),-1);
if (access ((char *) path, R_OK) == -1)
{
diff --git a/cde/programs/dtfile/Main.h b/cde/programs/dtfile/Main.h
index 08b4ffc3..b1fc6694 100644
--- a/cde/programs/dtfile/Main.h
+++ b/cde/programs/dtfile/Main.h
@@ -1615,11 +1615,7 @@ extern Pixmap _DtGetPixmap(
*/
#ifndef NO_MESSAGE_CATALOG
-# ifdef __ultrix
-# define _CLIENT_CAT_NAME "dtfile.cat"
-# else /* __ultrix */
# define _CLIENT_CAT_NAME "dtfile"
-# endif /* __ultrix */
extern char *_DtGetMessage(char *filename, int set, int n, char *s);
# define GETMESSAGE(set, number, string)\
(_DtGetMessage(_CLIENT_CAT_NAME, set, number, string))
diff --git a/cde/programs/dtfile/dtcopy/dtcopy.h b/cde/programs/dtfile/dtcopy/dtcopy.h
index c3e3b072..24bb4814 100644
--- a/cde/programs/dtfile/dtcopy/dtcopy.h
+++ b/cde/programs/dtfile/dtcopy/dtcopy.h
@@ -155,11 +155,7 @@ extern int touch(String path);
*/
#ifndef NO_MESSAGE_CATALOG
-# ifdef __ultrix
-# define _CLIENT_CAT_NAME "dtcopy.cat"
-# else /* __ultrix */
# define _CLIENT_CAT_NAME "dtcopy"
-# endif /* __ultrix */
extern char *_DtGetMessage(char *filename, int set, int n, char *s);
# define GETMESSAGE(set, number, string)\
(_DtGetMessage(_CLIENT_CAT_NAME, set, number, string))
diff --git a/cde/programs/dthelp/dthelpgen/helpgen.c b/cde/programs/dthelp/dthelpgen/helpgen.c
index 4df4ee73..577d615c 100644
--- a/cde/programs/dthelp/dthelpgen/helpgen.c
+++ b/cde/programs/dthelp/dthelpgen/helpgen.c
@@ -215,11 +215,7 @@ GetMessage (
/* Setup our default message catalog names if none have been set! */
/* Setup the short and long versions */
-#ifdef __ultrix
- catFileName = "dthelpgen.cat";
-#else
catFileName = "dthelpgen";
-#endif
first = 0;
if (strcmp (Lang, "C") == 0)
diff --git a/cde/programs/dthelp/dthelpprint/PrintUtil.c b/cde/programs/dthelp/dthelpprint/PrintUtil.c
index c923c883..c08518a0 100644
--- a/cde/programs/dthelp/dthelpprint/PrintUtil.c
+++ b/cde/programs/dthelp/dthelpprint/PrintUtil.c
@@ -260,11 +260,7 @@ char * _DtHPrGetMessage(
if (s_CatFileName == NULL)
{
/* Setup the short and long versions */
-#ifdef __ultrix
- s_CatFileName = strdup(HELPPRINT_CAT_WITH_SUFFIX);
-#else
s_CatFileName = strdup(HELPPRINT_CAT);
-#endif
}
s_First = 0;
diff --git a/cde/programs/dticon/main.h b/cde/programs/dticon/main.h
index a3f32f85..decbdcec 100644
--- a/cde/programs/dticon/main.h
+++ b/cde/programs/dticon/main.h
@@ -48,11 +48,7 @@
#ifndef NO_MESSAGE_CATALOG
-# ifdef __ultrix
-# define _CLIENT_CAT_NAME "dticon.cat"
-# else
# define _CLIENT_CAT_NAME "dticon"
-# endif /* __ultrix */
extern char *_DtGetMessage(char *filename, int set, int n, char *s);
# define GETSTR(set, number, string) \
(_DtGetMessage(_CLIENT_CAT_NAME, set, number, string))
@@ -70,4 +66,3 @@ extern char *_DtGetMessage(char *filename, int set, int n, char *s);
#endif /* _main_h */
/* DON'T ADD ANYTHING AFTER THIS #endif */
-
diff --git a/cde/programs/dtinfo/clients/dtinfo_start/dtinfo_start.h b/cde/programs/dtinfo/clients/dtinfo_start/dtinfo_start.h
index cc6dd468..a6344c4d 100644
--- a/cde/programs/dtinfo/clients/dtinfo_start/dtinfo_start.h
+++ b/cde/programs/dtinfo/clients/dtinfo_start/dtinfo_start.h
@@ -38,11 +38,7 @@
* macro to get message catalog strings
*/
#ifndef NO_MESSAGE_CATALOG
-# ifdef __ultrix
-# define _CLIENT_CAT_NAME "dtinfo_start.cat"
-# else /* __ultrix */
# define _CLIENT_CAT_NAME "dtinfo_start"
-# endif /* __ultrix */
extern char *_DtGetMessage (char *filename, int set_num, int message_num, char *message);
diff --git a/cde/programs/dtinfo/dtinfo/src/cgm/cgmcmds.c b/cde/programs/dtinfo/dtinfo/src/cgm/cgmcmds.c
index 7438f373..dea1a158 100644
--- a/cde/programs/dtinfo/dtinfo/src/cgm/cgmcmds.c
+++ b/cde/programs/dtinfo/dtinfo/src/cgm/cgmcmds.c
@@ -1524,7 +1524,6 @@ static int cellarray(dat_ptr, cmd_ptr, cgm_s)
Ry = y[2] - y[0];
/* figure out the determinant */
if (!(det = Rx * Qy - Ry * Qx)) return 1; /* co-linear */
- ddet = (double) det; /* explicit cast for Ultrix bug */
/* figure out the transformation matrix */
/* need nx+1, ny+1, because o integer arithmetic expanding range */
axx = (nx + 1) * (Qy - Ry) / ddet;
diff --git a/cde/programs/dtksh/ksh93/src/cmd/ksh93/sh/init.c b/cde/programs/dtksh/ksh93/src/cmd/ksh93/sh/init.c
index 6cf22eab..ba6f2f90 100644
--- a/cde/programs/dtksh/ksh93/src/cmd/ksh93/sh/init.c
+++ b/cde/programs/dtksh/ksh93/src/cmd/ksh93/sh/init.c
@@ -502,11 +502,7 @@ static MsgStr allmsgs[] = {
{"you have mail in $_", 25, 233},
{"zero byte", 25, 234},
};
-#ifdef __ultrix
-#define _CLIENT_CAT_NAME "dtksh.cat"
-#else /* __ultrix */
#define _CLIENT_CAT_NAME "dtksh"
-#endif /* __ultrix */
/*
* Without this proto, standard C says that _DtGetMessage() returns
diff --git a/cde/programs/dtksh/msgs.h b/cde/programs/dtksh/msgs.h
index f28c2b4a..c7a647f5 100644
--- a/cde/programs/dtksh/msgs.h
+++ b/cde/programs/dtksh/msgs.h
@@ -54,11 +54,7 @@ char * GetSharedMsg(
*/
#ifndef NO_MESSAGE_CATALOG
-# ifdef __ultrix
-# define _CLIENT_CAT_NAME "dtksh.cat"
-# else /* __ultrix */
# define _CLIENT_CAT_NAME "dtksh"
-# endif /* __ultrix */
/*
* Without this proto, standard C says that _DtGetMessage() returns
diff --git a/cde/programs/dtlogin/genauth.c b/cde/programs/dtlogin/genauth.c
index d9215539..c080dd0d 100644
--- a/cde/programs/dtlogin/genauth.c
+++ b/cde/programs/dtlogin/genauth.c
@@ -111,9 +111,6 @@ extern int errno;
# ifdef AIXV3
# define USE_CRYPT
# endif
-# ifdef ultrix
-# define USE_CRYPT
-# endif
# ifdef hpux
# define USE_CRYPT
# endif
diff --git a/cde/programs/dtpad/main.c b/cde/programs/dtpad/main.c
index 15eb8cc5..5c817ed7 100644
--- a/cde/programs/dtpad/main.c
+++ b/cde/programs/dtpad/main.c
@@ -117,12 +117,8 @@
# if !defined(NL_CAT_LOCALE)
# define NL_CAT_LOCALE 0
# endif
-# ifdef __ultrix
-# define _DTPAD_CAT_NAME "dtpad.cat"
-# else /* __ultrix */
static const char catalogName[] = "dtpad";
# define _DTPAD_CAT_NAME catalogName
-# endif /* __ultrix */
#endif
diff --git a/cde/programs/dtsession/Sm.h b/cde/programs/dtsession/Sm.h
index 0f5a3bd7..58b44154 100644
--- a/cde/programs/dtsession/Sm.h
+++ b/cde/programs/dtsession/Sm.h
@@ -129,11 +129,7 @@
#define SM_CM_DEFAULT SM_CM_NONE
#ifndef NO_MESSAGE_CATALOG
-# ifdef __ultrix
-# define _CLIENT_CAT_NAME "dtsession.cat"
-# else /* __ultrix */
# define _CLIENT_CAT_NAME "dtsession"
-# endif /* __ultrix */
extern char *_DtGetMessage(char *filename, int set, int n, char *s);
# define GETMESSAGE(set, number, string)\
(_DtGetMessage(_CLIENT_CAT_NAME, set, number, string))
diff --git a/cde/programs/dtsession/Srv.h b/cde/programs/dtsession/Srv.h
index abd12865..3de4ed09 100644
--- a/cde/programs/dtsession/Srv.h
+++ b/cde/programs/dtsession/Srv.h
@@ -87,11 +87,7 @@
* macro to get message catalog strings
*/
#ifndef NO_MESSAGE_CATALOG
-# ifdef __ultrix
-# define _CLIENT_CAT_NAME "dtsession.cat"
-# else /* __ultrix */
# define _CLIENT_CAT_NAME "dtsession"
-# endif /* __ultrix */
extern char *_DtGetMessage(char *filename, int set, int n, char *s);
# define GETMESSAGE(set, number, string)\
(_DtGetMessage(_CLIENT_CAT_NAME, set, number, string))
diff --git a/cde/programs/dtudcexch/excutil.h b/cde/programs/dtudcexch/excutil.h
index cd6955ad..0e86e7c2 100644
--- a/cde/programs/dtudcexch/excutil.h
+++ b/cde/programs/dtudcexch/excutil.h
@@ -96,11 +96,7 @@ typedef struct {
} ListData;
#ifndef NO_MESSAGE_CATALOG
-# ifdef __ultrix
-# define _CLIENT_CAT_NAME "dtudcexch.cat"
-# else /* __ultrix */
# define _CLIENT_CAT_NAME "dtudcexch"
-# endif /* __ultrix */
# ifdef _NO_PROTO
extern char *_DtGetMessage();
# else /* _NO_PROTO */
diff --git a/cde/programs/dtudcfonted/libfal/_falSetLocale.c b/cde/programs/dtudcfonted/libfal/_falSetLocale.c
index ab5ef13f..d3a33f8e 100644
--- a/cde/programs/dtudcfonted/libfal/_falSetLocale.c
+++ b/cde/programs/dtudcfonted/libfal/_falSetLocale.c
@@ -161,17 +161,12 @@ _fallcMapOSLocaleName(osname, siname)
char *osname;
char *siname;
{
-#if defined(hpux) || defined(CSRG_BASED) || defined(sun) || defined(SVR4) || defined(__osf__) || defined(AIXV3) || defined(ultrix) || defined(WIN32)
+#if defined(hpux) || defined(CSRG_BASED) || defined(sun) || defined(SVR4) || defined(__osf__) || defined(AIXV3) || defined(WIN32)
#ifdef hpux
#define SKIPCOUNT 2
#define STARTCHAR ':'
#define ENDCHAR ';'
#else
-#ifdef ultrix
-#define SKIPCOUNT 2
-#define STARTCHAR '\001'
-#define ENDCHAR '\001'
-#else
#ifdef WIN32
#define SKIPCOUNT 1
#define STARTCHAR '='
@@ -188,7 +183,6 @@ _fallcMapOSLocaleName(osname, siname)
#define ENDCHAR '/'
#endif
#endif
-#endif
#endif
char *start;
diff --git a/cde/programs/dtudcfonted/libfal/_fallcint.h b/cde/programs/dtudcfonted/libfal/_fallcint.h
index 3927840d..137b9df8 100644
--- a/cde/programs/dtudcfonted/libfal/_fallcint.h
+++ b/cde/programs/dtudcfonted/libfal/_fallcint.h
@@ -668,13 +668,6 @@ typedef struct _XOC {
XOCCoreRec core;
} XOCRec;
-
-/* current Ultrix compiler gets horribly confused */
-#if defined(FUNCPROTO) && defined(ultrix)
-#undef NeedFunctionPrototypes
-#endif
-
-
/*
* X Input Managers are an instantiable object, so we define it, the
* object itself, a method list and data.
@@ -847,11 +840,6 @@ typedef struct _XIC {
XICCoreRec core; /* data of this IC */
} XICRec;
-/* current Ultrix compiler gets horribly confused */
-#if !defined(NeedFunctionPrototypes) && defined(FUNCPROTO)
-#define NeedFunctionPrototypes 1
-#endif
-
typedef XLCd (*XLCdLoadProc)(
#if NeedFunctionPrototypes
char*
diff --git a/cde/programs/dtudcfonted/ufont.c b/cde/programs/dtudcfonted/ufont.c
index 38b0b508..595da038 100644
--- a/cde/programs/dtudcfonted/ufont.c
+++ b/cde/programs/dtudcfonted/ufont.c
@@ -42,11 +42,7 @@
#include "util.h"
#ifndef NO_MESSAGE_CAT
-#ifdef __ultrix
-#define _CLIENT_CAT_NAME "dtudcfonted.cat"
-#else /* __ultrix */
#define _CLIENT_CAT_NAME "dtudcfonted"
-#endif /* __ultrix */
#ifdef _NO_PROTO
extern char *_DtGetMessage();
#else /* _NO_PROTO */
diff --git a/cde/programs/dtwm/DataBaseLoad.h b/cde/programs/dtwm/DataBaseLoad.h
index cc36a1b0..bf59bf55 100644
--- a/cde/programs/dtwm/DataBaseLoad.h
+++ b/cde/programs/dtwm/DataBaseLoad.h
@@ -512,11 +512,7 @@ extern void GeneralTopicHelpCB(Widget, XtPointer, XtPointer);
extern char *_DtGetMessage(char *filename, int set, int n, char *s);
#ifndef NO_MESSAGE_CATALOG
-# ifdef __ultrix
-# define _FP_CLIENT_CAT_NAME "fp.cat"
-# else /* __ultrix */
# define _FP_CLIENT_CAT_NAME "fp"
-# endif /* __ultrix */
# define FPGETMESSAGE(set, number, string)\
_DtGetMessage(_FP_CLIENT_CAT_NAME, set, number, string)
#else
diff --git a/cde/programs/dtwm/README b/cde/programs/dtwm/README
index 0c0da589..216c0aa9 100644
--- a/cde/programs/dtwm/README
+++ b/cde/programs/dtwm/README
@@ -5,7 +5,7 @@ Conditional Compilation
-----------------------
The following is a listing of the conditional compilation switches that
-are "not obvious." Excluded are hardware or OS identifiers (e.g. __ultrix),
+are "not obvious." Excluded are hardware or OS identifiers (e.g. sun),
header file include flags, and macros (e.g. ABS).
ALTERNATE_POSTMENU
diff --git a/cde/programs/dtwm/WmGlobal.h b/cde/programs/dtwm/WmGlobal.h
index 75451134..ced730c6 100644
--- a/cde/programs/dtwm/WmGlobal.h
+++ b/cde/programs/dtwm/WmGlobal.h
@@ -2510,11 +2510,7 @@ extern char *_DtGetMessage(char *filename, int set, int n, char *s);
* macro to get message catalog strings
*/
#ifndef NO_MESSAGE_CATALOG
-# ifdef __ultrix
-# define _CLIENT_CAT_NAME "dtwm.cat"
-# else /* __ultrix */
# define _CLIENT_CAT_NAME "dtwm"
-# endif /* __ultrix */
# ifdef WSM
# define GETMESSAGE(set, number, string)\
_DtGetMessage(_CLIENT_CAT_NAME, set, number, string)
--
2.17.0
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel
