This patch should gut the code of irix support, I say should and not will
because unfortunately, the developers of CDE made very little distinction
between the hardware (MIPS), the operating system (irix) and the company
(silicon graphics) and decided to call them all SGI. This made sense back then,
when these components were tightly knit and you really wouldn't really see one
without the other, but in 2018, SGI is bankrupt, irix is dead, and MIPS is no
longer associated with SGI hardware. So I erred on the side of caution and
removed things that i knew were irix related, so nothing should break, however
there may be some leftover cruft that I misjudged as important, if you find
any, just remove it and send the patch upstream. I also made sure not to touch
documentation.
Thank you for your time,
-Chase
From dd4d24cc5963b00c8088f36854a59ad5ddcb7ef6 Mon Sep 17 00:00:00 2001
From: chase <ch...@localhost.com>
Date: Thu, 26 Apr 2018 04:07:56 -0700
Subject: [PATCH] Remove irix support
---
.../IntegTools/post_install/hp/configRun | 2 -
cde/config/cf/Imake.cf | 21 --
cde/config/cf/Imakefile | 3 -
cde/config/cf/OpenBSD.cf | 2 +-
cde/config/cf/sgi.cf | 258 ------------------
cde/config/cf/sgiLib.rules | 166 -----------
cde/config/cf/sgiLib.tmpl | 14 -
cde/config/cf/site.def | 10 -
cde/config/imake/imakemdep.h | 14 +-
cde/lib/tt/bin/dbck/options.C | 2 +-
cde/lib/tt/bin/tt_type_comp/mp_type_comp.C | 12 +-
cde/lib/tt/bin/ttdbserverd/db_server_svc.C | 10 +-
cde/lib/tt/bin/ttsession/mp_server.C | 12 +-
cde/lib/tt/lib/mp/mp_procid.C | 23 +-
cde/lib/tt/lib/mp/mp_rpc_client.C | 15 +-
cde/lib/tt/lib/tt_options.h | 22 +-
cde/lib/tt/lib/util/tt_port.C | 12 +-
cde/programs/dtdocbook/tcl/tclUnixPort.h | 3 -
cde/programs/dtinfo/DtMmdb/utility/funcs.h | 4 +-
.../dtinfo/dtinfogen/infolib/etc/dtinfogen | 9 +-
cde/programs/dtksh/ksh93/src/cmd/ksh93/README | 2 -
.../ksh93/src/cmd/ksh93/bltins/typeset.c | 2 +-
.../ksh93/src/cmd/ksh93/include/terminal.h | 8 -
.../dtksh/ksh93/src/lib/lib0ast/hostinfo.sh | 11 -
.../dtksh/ksh93/src/lib/lib0ast/hosttype.tst | 1 -
.../dtudcfonted/libfal/_falSetLocale.c | 2 +-
cde/programs/nsgmls/ExtendEntityManager.C | 2 +-
27 files changed, 51 insertions(+), 591 deletions(-)
delete mode 100644 cde/config/cf/sgi.cf
delete mode 100644 cde/config/cf/sgiLib.rules
delete mode 100644 cde/config/cf/sgiLib.tmpl
diff --git a/cde/admin/IntegTools/post_install/hp/configRun b/cde/admin/IntegTools/post_install/hp/configRun
index 33af24c8..ed5c1843 100755
--- a/cde/admin/IntegTools/post_install/hp/configRun
+++ b/cde/admin/IntegTools/post_install/hp/configRun
@@ -535,7 +535,6 @@ RemoveRunFiles()
/usr/dt/lib/bindings/motorola
/usr/dt/lib/bindings/ncr_at
/usr/dt/lib/bindings/ncr_vt
-/usr/dt/lib/bindings/sgi
/usr/dt/lib/bindings/siemens_9733
/usr/dt/lib/bindings/siemens_wx200
/usr/dt/lib/bindings/sony
@@ -826,7 +825,6 @@ VerifyInstalledFiles()
/usr/dt/lib/bindings/motorola 0444 lib/Xm/bindings/motorola file bin bin di---- 378 cde_dt
/usr/dt/lib/bindings/ncr_at 0444 lib/Xm/bindings/ncr_at file bin bin di---- 378 cde_dt
/usr/dt/lib/bindings/ncr_vt 0444 lib/Xm/bindings/ncr_vt file bin bin di---- 378 cde_dt
-/usr/dt/lib/bindings/sgi 0444 lib/Xm/bindings/sgi file bin bin di---- 378 cde_dt
/usr/dt/lib/bindings/siemens_9733 0444 lib/Xm/bindings/siemens_9733 file bin bin di---- 378 cde_dt
/usr/dt/lib/bindings/siemens_wx200 0444 lib/Xm/bindings/siemens_wx200 file bin bin di---- 378 cde_dt
/usr/dt/lib/bindings/sony 0444 lib/Xm/bindings/sony file bin bin di---- 378 cde_dt
diff --git a/cde/config/cf/Imake.cf b/cde/config/cf/Imake.cf
index e9def39f..a95d4d1e 100644
--- a/cde/config/cf/Imake.cf
+++ b/cde/config/cf/Imake.cf
@@ -81,10 +81,6 @@ XCOMM $TOG: Imake.cf /main/30 1998/04/28 13:55:25 barstow $
# define ArcArchitecture
# undef arc
# endif
-# ifdef sgi
-# define SGIArchitecture
-# undef sgi
-# endif
# ifdef pmax
# define PmaxArchitecture
# undef pmax
@@ -367,23 +363,6 @@ XCOMM $TOG: Imake.cf /main/30 1998/04/28 13:55:25 barstow $
# define CrayArchitecture
#endif /* _CRAY */
-#ifdef sgi
-# define MacroIncludeFile <sgi.cf>
-# define MacroFile sgi.cf
-# undef sgi
-# define SGIArchitecture
-# undef mips
-# define MipsArchitecture
-# ifdef _SVR4
-# undef _SVR4
-# define SVR4Architecture
-# endif
-# ifdef _SYSTYPE_SVR4
-# undef _SYSTYPE_SVR4
-# define SVR4Architecture
-# endif
-#endif /* sgi */
-
#ifdef stellar
# define MacroIncludeFile <stellar.cf>
# define MacroFile stellar.cf
diff --git a/cde/config/cf/Imakefile b/cde/config/cf/Imakefile
index 2f5627d3..543ca7cb 100644
--- a/cde/config/cf/Imakefile
+++ b/cde/config/cf/Imakefile
@@ -28,7 +28,6 @@ oldlib.rules \
os2Lib.rules \
osfLib.rules \
scoLib.rules \
-sgiLib.rules \
sunLib.rules \
sv3Lib.rules \
sv4Lib.rules \
@@ -50,7 +49,6 @@ lnxLib.tmpl \
necLib.tmpl \
os2Lib.tmpl \
osfLib.tmpl \
-sgiLib.tmpl \
sunLib.tmpl \
sv3Lib.tmpl \
sv4Lib.tmpl \
@@ -87,7 +85,6 @@ osf1.cf \
pegasus.cf \
sco.cf \
sequent.cf \
-sgi.cf \
sony.cf \
sun.cf \
svr3.cf \
diff --git a/cde/config/cf/OpenBSD.cf b/cde/config/cf/OpenBSD.cf
index 51de4311..f828fec2 100644
--- a/cde/config/cf/OpenBSD.cf
+++ b/cde/config/cf/OpenBSD.cf
@@ -711,7 +711,7 @@ install:: fonts.alias @@\
/*
- * Definitions for the mips architecture (currently sgi)
+ * Definitions for the mips architecture
*/
#ifdef MipsArchitecture
diff --git a/cde/config/cf/sgi.cf b/cde/config/cf/sgi.cf
deleted file mode 100644
index cbccd28a..00000000
--- a/cde/config/cf/sgi.cf
+++ /dev/null
@@ -1,258 +0,0 @@
-XCOMM platform: $TOG: sgi.cf /main/49 1998/02/26 09:12:19 barstow $
-
-#ifndef OSName
-# define OSName DefaultOSName
-#endif
-#ifndef OSMajorVersion
-# define OSMajorVersion DefaultOSMajorVersion
-#endif
-#ifndef OSMinorVersion
-# define OSMinorVersion DefaultOSMinorVersion
-#endif
-#ifndef OSTeenyVersion
-# define OSTeenyVersion DefaultOSTeenyVersion
-#endif
-XCOMM operating system: OSName (OSMajorVersion.OSMinorVersion.OSTeenyVersion)
-
-#if OSMajorVersion < 4
-/* We do not guarantee this will work */
-#define BootstrapCFlags -DX_WCHAR -DX_LOCALE -DX_USEBFUNCS -DSYSV
-#define StandardDefines -DX_WCHAR -DX_LOCALE -DX_USEBFUNCS -DSYSV
-#define SetTtyGroup NO
-#else
-#define HasPlugin YES
-#define SetTtyGroup YES
-#define ExtraFilesToClean so_locations
-#endif
-
-#if OSMajorVersion < 5
-#define SystemV YES
-#define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC
-#else
-#define BootstrapCFlags -DSVR4
-#define StandardDefines -DSVR4
-#define SystemV4 YES
-#define HasWChar32 YES
-#define HasVFork NO
-#if OSMajorVersion < 6
-#define XawI18nDefines -DHAS_WCTYPE_H -DHAS_ISW_FUNCS
-#else
-#define XawI18nDefines -DHAS_WCHAR_H -DHAS_ISW_FUNCS
-#endif
-#define AllocateLocalDefines -DINCLUDE_ALLOCA_H
-#ifndef ExtraLoadFlags
-#define ExtraLoadFlags -Wl,-rpath,$(USRLIBDIRPATH)
-#endif
-#endif
-
-/*
- * To build 64-bit binaries define Mips64Architecture in your site.def or
- * host.def file. This is usually on done at the X Consortium to test
- * big endian 64-bit cleanliness.
- * To build 32-bit binaries using the old 32-bit mode, define
- * NoMipsN32Archtecture in your site.def or host.def file.
- * Otherwise the default is to use the "new 32" mode as requested by SGI.
- */
-#ifndef MipsN32Architecture
-#if !defined(Mips64Architecture) && !defined(NoMipsN32Architecture)
-#define MipsN32Architecture YES
-#endif
-#endif
-
-#ifdef Mips64Architecture
-# define BuildLibPathVar _RLD_ROOT=/dev/null LD_LIBRARY64_PATH
-# define SystemBuildLibPath /usr/lib64:/lib64
-# define LdCmd ld -64
-#elif defined(MipsN32Architecture)
-# define BuildLibPathVar _RLD_ROOT=/dev/null LD_LIBRARYN32_PATH
-# define SystemBuildLibPath /usr/lib32:/lib32
-# define LdCmd ld -n32
-#else
-# define BuildLibPathVar _RLD_ROOT=/dev/null LD_LIBRARY_PATH
-# define SystemBuildLibPath /usr/lib:/lib
-#endif
-#define HasCplusplus YES
-#define Malloc0ReturnsNull YES /* IRIX [56].x -lmalloc needs this */
-#define HasPutenv YES
-#define ExecableScripts YES
-#define HasNdbm YES
-#define HasPoll YES
-#define ExpandManNames YES
-#ifndef BuildXInputExt
-#define BuildXInputExt YES
-#endif
-
-#if OSMajorVersion > 3 || (OSMajorVersion == 3 && OSMinorVersion > 2)
-#define NeedVarargsPrototypes YES
-#define NeedConstPrototypes YES
-#define NeedWidePrototypes NO
-#endif
-
-#include <sgiLib.rules>
-
-#if OSMajorVersion < 5
-#define SymbolTables -Wf,-XNp16000,-XNd16000,-XNh2000
-#define PexSymbolTables -Wf,-XNp15000,-XNd15000,-XNh2000
-#define ServerSymbolTables -Wf,-XNp8000,-XNh2000,-XNd8000
-#else
-#define SymbolTables
-#define PexSymbolTables
-#define ServerSymbolTables
-#endif
-
-/* this is for floating point, ANSI cpp */
-#if OSMajorVersion < 5
-/* Extra libraries provide : yp, sysV malloc, shared libc, and widechar */
-# define ExtraLibraries -lsun -lmalloc -lc_s -lw
-# define sgiCCOptions -xansi -D__STDC__=1 -float
-#else
-# if OSMajorVersion < 6
-# define sgiCCOptions -xansi
-# else
-# define CppCmd cc -E -cckr
-# ifdef Mips64Architecture
-/* set Mips64Architecture in host.def. Usually don't need it but we
- * (the X Consortium) want a 64-bit big-endian machine to test on. */
-# define sgiCCOptions -xansi -mips3 -64
-# define DlLibrary /**/
-# elif defined(MipsN32Architecture)
-/* Set MipsN32Architecture to build "new" 32-bit objs with a 32-bit kernel. */
-# define sgiCCOptions -xansi -mips3 -n32
-# else
-# define sgiCCOptions -xansi
-# endif
-# if OSMinorVersion == 2
-/* if you haven't installed patch 1361, 1403, or 1645 on IRIX 6.2 then you
- * must add "#define HasPosixThreads NO" in your site.def or host.def file
- */
-# ifndef HasPosixThreads
-# define HasPosixThreads YES
-# endif
-# define ThreadedX HasPosixThreads
-# define ThreadsLibraries -lpthread
-/*
- * Add "#define HasSgiThreadsPatch1403 YES" to your site.def or host.def if
- * that's which patch you have.
- */
-# ifndef HasSgiThreadsPatch1403
-# define HasSgiThreadsPatch1403 NO
-# endif
-# if (HasSgiThreadsPatch1403)
-# define SystemMTDefines -D_POSIX_THREAD_SAFE_FUNCTIONS
-# endif
-# endif
-# endif
-/* SGI's -lsocket -lnsl is broken, at least in 5.2, so override here */
-# define ExtraLibraries /**/
-#endif
-
-#define DefaultCCOptions sgiCCOptions SymbolTables
-#define PexCCOptions sgiCCOptions PexSymbolTables
-#define ServerCCOptions sgiCCOptions ServerSymbolTables
-
-/* For SGI C++ compiler, need to search extra dirs in make depend */
-#ifndef CplusplusDependIncludes
-#define CplusplusDependIncludes -I/usr/include/CC
-#endif
-
-/* At SGI, we don't need this */
-#define ConstructMFLAGS NO /* build MFLAGS from MAKEFLAGS */
-
-/* Used only for compressed fonts */
-#define UNCOMPRESSPATH /usr/bsd/uncompress
-
-/* Normally used only to conditionally chose the default font path order */
-#define PrimaryScreenResolution 96
-
-/* Override Imake.tmpl's "-X" flag */
-#define LdCombineFlags -r
-
-/* Installation Build Parameters */
-#define InstKmemFlags -m 2711 -g sys
-
-#define ArCmd ar scq
-
-/* for xdm or anyone else to use */
-#define DefaultUserPath :/usr/sbin:/usr/bsd:/usr/bin:/bin:$(BINDIR):/etc:/usr/etc
-#define DefaultSystemPath /usr/sbin:/usr/bsd:/bin:/etc:/usr/bin:/usr/etc:$(BINDIR)
-
-#ifndef BuildServer
-#define BuildServer NO
-#endif
-#define ServerOSDefines -DDDXTIME
-/* only need this for binary compatibility with their ddx */
-#ifndef Mips64Architecture
-#define ServerExtraDefines -DNEED_LINEHELPER AllocateLocalDefines
-#else
-#define ServerExtraDefines -D_XSERVER64 -DNEED_LINEHELPER AllocateLocalDefines
-#endif
-
-/* Changed to a single shell command for pmake/smake */
-#if OSMajorVersion < 5
-/*
- * NormalLibObjCompile - compile fragment for a library object file
- * do ld -x to remove line number symbols for libraries
- */
-#define NormalLibObjCompile(options) ClearmakeOSName \
- $(RM) $@ $*.os \ @@\
- && $(CC) -c options $(CFLAGS) $*.c \ @@\
- && $(LD) $(LDSTRIPFLAGS) -r $@ -o $*.os \ @@\
- && $(MV) $*.os $@
-#endif
-
-#define LibObjCompile(dir,options) ClearmakeOSName \
- $(RM) $@ dir/$@ \ @@\
- && $(CC) -c $(CCOPTIONS) $(ALLDEFINES) options $*.c \ @@\
- && $(MV) $@ dir/$@
-
-#ifndef HasMakefileSafeInclude
-#define HasMakefileSafeInclude YES
-#endif
-#ifndef IncludeMakefile
-#define IncludeMakefile(file) @@sinclude file
-#endif
-
-/* needs to find nroff on the system to work */
-#ifndef ManKeywordsTarget
-#define ManKeywordsTarget(manpath) @@\
-man_keywords:: @@\
- /usr/lib/makewhatis -M $(DESTDIR)manpath $(DESTDIR)manpath/whatis
-#endif
-
-#define MotifDefines -DSYS_DIR -DPORT_NOVFORK -DNO_REGCOMP
-
-#ifndef CppFileTarget
-#define CppFileTarget(dst,src,defs,deplist) @@\
-dst:: src deplist @@\
- RemoveFile($@) @@\
- ClearmakeOSName \
- $(CPP) CppNoLineInfoOption defs src 2>/dev/null | CppSedMagic >$@; @@\
- @@\
-clean:: @@\
- RemoveFiles(dst)
-#endif /* CppFileTarget */
-
-#ifndef CppScriptTarget
-#if ExecableScripts /* can use #! instead of colon */
-#define CppScriptTarget(dst,src,defs,deplist) @@\
-dst:: src deplist @@\
- RemoveFile($@) @@\
- ClearmakeOSName \
- $(CPP) CppNoLineInfoOption defs src | CppSedMagic >$@ @@\
- chmod a+x $@ @@\
- @@\
-clean:: @@\
- RemoveFiles(dst)
-#else
-#define CppScriptTarget(dst,src,defs,deplist) @@\
-dst:: src deplist @@\
- RemoveFile($@) @@\
- ClearmakeOSName \
- echo \: >$@ @@\
- sed '1d' src | $(CPP) CppNoLineInfoOption defs | CppSedMagic >>$@ @@\
- chmod a+x $@ @@\
- @@\
-clean:: @@\
- RemoveFile(dst)
-#endif /* ExecableScripts */
-#endif /* CppScriptTarget */
diff --git a/cde/config/cf/sgiLib.rules b/cde/config/cf/sgiLib.rules
deleted file mode 100644
index ef066d41..00000000
--- a/cde/config/cf/sgiLib.rules
+++ /dev/null
@@ -1,166 +0,0 @@
-XCOMM $XConsortium: sgiLib.rules /main/16 1996/09/28 18:11:04 rws $
-
-#ifndef HasSharedLibraries
-#define HasSharedLibraries YES
-#endif
-#if OSMajorVersion < 5
-#ifndef SharedDataSeparation
-#define SharedDataSeparation YES
-#endif
-#define SharedCodeDef -DSHAREDCODE
-#define SharedLibraryDef -DATTSHAREDLIB
-#define PositionIndependentCFlags -G 0
-
-/*
- * SharedLibraryTarget - generate rules to create a shared library;
- * build it into a different name so that we don't hose people by having
- * the library gone for long periods.
- */
-#define SharedLibraryTarget(libname,rev,solist,down,up) @@\
-AllTarget(Concat3(lib,libname,_s)) @@\
- @@\
-Concat3(lib,libname,_s): sharedlib.o solist Concat(lib,libname.spec) $(EXTRALIBRARYDEPS) @@\
- $(RM) $@ $@.a \ @@\
- && cd down \ @@\
- && mkshlib -s Concat(up/lib,libname.spec) -t up/$@ -h up/$@.a \ @@\
- && ar rs up/$@.a sharedlib.o @@\
- LinkBuildLibrary($@) @@\
- LinkBuildLibrary($@.a) @@\
- @@\
-clean:: @@\
- $(RM) Concat3(lib,libname,_s) Concat3(lib,libname,_s.a)
-
-#define SharedLibraryDataTarget(libname,rev,salist)
-
-/*
- * InstallSharedLibrary - generate rules to install the shared library.
- * NOTE: file must be executable, hence "INSTBINFLAGS"
- */
-#define InstallSharedLibrary(libname,rev,dest) @@\
-install:: Concat3(lib,libname,_s) @@\
- MakeDir($(DESTDIR)dest) @@\
- $(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) Concat3(lib,libname,_s.a) $(DESTDIR)dest @@\
- $(INSTALL) $(INSTALLFLAGS) $(INSTBINFLAGS) Concat3(lib,libname,_s) $(DESTDIR)dest
-
-
-/*
- * InstallSharedLibraryData - generate rules to install the shared library data
- */
-#define InstallSharedLibraryData(libname,rev,dest) @@\
-InstallTarget(install,Concat3(lib,libname,_s.a),$(INSTLIBFLAGS),dest)
-
-#else /* OSMajorVersion >= 5 */
-
-#ifndef SharedDataSeparation
-#define SharedDataSeparation NO
-#endif
-#ifndef SharedCodeDef
-#define SharedCodeDef /**/
-#endif
-#ifndef SharedLibraryDef
-#define SharedLibraryDef /**/
-#endif
-#ifndef ShLibIncludeFile
-#define ShLibIncludeFile <sgiLib.tmpl>
-#endif
-#ifndef SharedLibraryLoadFlags
-#if OSMajorVersion < 6
-#define SharedLibraryLoadFlags -shared
-#else
-#ifndef Mips64Architecture
-#define SharedLibraryLoadFlags -shared
-#else
-#define SharedLibraryLoadFlags -shared -mips3
-#endif
-#endif
-#endif
-/* -KPIC is redundant, PIC is always used unless you specify -non_shared */
-#ifndef PositionIndependentCFlags
-#define PositionIndependentCFlags -KPIC
-#endif
-#ifndef PositionIndependentCplusplusFlags
-#define PositionIndependentCplusplusFlags -KPIC
-#endif
-
-/*
- * SGI's cc passes an undocumented flag to ld that causes it to look for
- * -lX11 and force use of libX11.so.1. And it can't be turned off. Sigh.
- * So we install one of those, too, in the shared library install target.
- */
-
-/*
- * InstallSharedLibrary - generate rules to install the shared library.
- */
-#ifndef InstallSharedLibrary
-#define InstallSharedLibrary(libname,rev,dest) @@\
-install:: Concat(lib,libname.so.rev) @@\
- MakeDir($(DESTDIR)dest) @@\
- $(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) Concat(lib,libname.so.rev) $(DESTDIR)dest @@\
- $(RM) Concat($(DESTDIR)dest/lib,libname.so) @@\
- cd $(DESTDIR)dest; $(LN) Concat(lib,libname.so.rev) Concat(lib,libname.so) @@\
- if [ "libname" = X11 ]; then \ @@\
- RemoveFile(Concat($(DESTDIR)dest/lib,libname.so.1)); \ @@\
- cd $(DESTDIR)dest; $(LN) Concat(lib,libname.so.rev) Concat(lib,libname.so.1);\ @@\
- fi
-
-#endif /* InstallSharedLibrary */
-
-/*
- * InstallSharedLibraryData - generate rules to install the shared library data
- */
-#ifndef InstallSharedLibraryData
-#define InstallSharedLibraryData(libname,rev,dest)
-#endif /* InstallSharedLibraryData */
-
-
-/*
- * SharedLibraryTarget - generate rules to create a shared library;
- * build it into a different name so that we do not hose people by having
- * the library gone for long periods.
- */
-
-/*
- * SGI's cc passes an undocumented flag to ld that causes it to look for
- * -lX11 and force use of libX11.so.1. Sigh. So we make one of those, too,
- * in the shared library build target.
- */
-
-#ifndef sgiX11soHack
-#ifdef UseInstalled
-#define sgiX11soHack(libname) /**/
-#else
-#define sgiX11soHack(libname) if [ "libname" = X11 ]; then \ @@\
- RemoveFile($(BUILDLIBDIR)/Concat(lib,libname.so.1)); \ @@\
- cd $(BUILDLIBDIR); $(LN) $(BUILDINCTOP)/$(CURRENT_DIR)/$@ Concat(lib,libname.so.1); \ @@\
- fi
-#endif
-#endif /* sgiX11soHack */
-
-#ifndef SharedLibraryTarget
-#define SharedLibraryTarget(libname,rev,solist,down,up) @@\
-AllTarget(Concat(lib,libname.so.rev)) @@\
- @@\
-Concat(lib,libname.so.rev): solist $(EXTRALIBRARYDEPS) @@\
- $(RM) $@~ @@\
- (cd down; $(CCENVSETUP) $(LD) -o up/$@~ $(SHLIBLDFLAGS) -soname $@ solist $(REQUIREDLIBS)) @@\
- $(RM) $@ @@\
- $(MV) $@~ $@ @@\
- $(RM) Concat(lib,libname.so) @@\
- $(LN) $@ Concat(lib,libname.so) @@\
- LinkBuildLibrary($@) @@\
- LinkBuildLibrary(Concat(lib,libname.so)) @@\
- sgiX11soHack(libname) @@\
- @@\
-clean:: @@\
- $(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so) so_locations
-
-#endif /* SharedLibraryTarget */
-
-/*
- * SharedLibraryDataTarget - generate rules to create shlib data file;
- */
-#ifndef SharedLibraryDataTarget
-#define SharedLibraryDataTarget(libname,rev,salist)
-#endif /* SharedLibraryTarget */
-
-#endif /* OsMajorVersion < 5 else */
diff --git a/cde/config/cf/sgiLib.tmpl b/cde/config/cf/sgiLib.tmpl
deleted file mode 100644
index fba0dfb8..00000000
--- a/cde/config/cf/sgiLib.tmpl
+++ /dev/null
@@ -1,14 +0,0 @@
-XCOMM $XConsortium: sgiLib.tmpl /main/2 1996/09/28 16:12:44 rws $
-
-/*
- * SGI shared library template
- */
-#define SharedXtReqs $(LDPRELIBS) $(XLIBONLY) -delay_load $(SMLIB) -delay_load $(ICELIB)
-#define SharedXmuReqs $(LDPRELIBS) $(XTOOLONLYLIB)
-#define SharedXawReqs -lw
-#define SharedXpReqs $(LDPRELIBS) $(XLIB)
-
-#define SharedXReqs $(XTOOLLIB) $(XLIB) -lgen
-#define SharedXmReqs $(LDPRELIBS) SharedXReqs
-#define SharedMrmReqs $(LDPRELIBS) $(XMLIB) SharedXReqs
-#define SharedUilReqs $(LDPRELIBS) $(MRESOURCELIB) $(XMLIB) SharedXReqs
diff --git a/cde/config/cf/site.def b/cde/config/cf/site.def
index 85fe2afe..96438927 100644
--- a/cde/config/cf/site.def
+++ b/cde/config/cf/site.def
@@ -51,10 +51,6 @@ XCOMM site: $TOG: site.def /main/23 1998/03/19 18:43:26 mgreess $
# define HasHPCplusplus YES
# endif
-# if defined(SGIArchitecture)
-# define MipsN32Architecture YES
-# endif
-
# if defined(SunArchitecture)
# ifndef HasSunC
# define HasSunC NO
@@ -150,12 +146,6 @@ XCOMM or building non-C locales will cause build failures.
#define HasTestCenter YES
#endif
-#ifdef SGIArchitecture
-#if OSMajorVersion > 5
-#define HasPurify YES
-#endif
-#endif
-
XCOMM define DtDocLocalesToBuild to be the same as DtLocalesToBuild if undefined
#ifndef DtDocLocalesToBuild
# define DtDocLocalesToBuild DtLocalesToBuild
diff --git a/cde/config/imake/imakemdep.h b/cde/config/imake/imakemdep.h
index 4a5bd868..98621c69 100644
--- a/cde/config/imake/imakemdep.h
+++ b/cde/config/imake/imakemdep.h
@@ -271,9 +271,6 @@ in this Software without prior written authorization from The Open Group.
#if defined(__FreeBSD__) && (__FreeBSD__ >= 10) && !defined(__llvm__)
#undef DEFAULT_CPP
#endif
-#if defined(__sgi) && defined(__ANSI_CPP__)
-#define USE_CC_E
-#endif
#ifdef MACH
#define USE_CC_E
#endif
@@ -580,9 +577,6 @@ char *cpp_argv[ARGUMENTS] = {
# endif
# endif
#endif
-#if defined(__sgi) && defined(__ANSI_CPP__)
- "-cckr",
-#endif
#ifdef __minix_vmd
"-Dminix",
#endif
@@ -612,7 +606,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(sgi) || defined(ultrix) || defined(linux) || defined(sony)
+#elif defined(sun) || defined(ultrix) || 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]"
@@ -860,12 +854,6 @@ struct symtab predefs[] = {
#ifdef PC_UX
{"PC_UX", "1"},
#endif
-#ifdef sgi
- {"sgi", "1"},
-#endif
-#ifdef __sgi
- {"__sgi", "1"},
-#endif
#ifdef __FreeBSD__
{"__FreeBSD__", "1"},
#endif
diff --git a/cde/lib/tt/bin/dbck/options.C b/cde/lib/tt/bin/dbck/options.C
index 1a6846e8..1f51c0b2 100644
--- a/cde/lib/tt/bin/dbck/options.C
+++ b/cde/lib/tt/bin/dbck/options.C
@@ -37,7 +37,7 @@
#include <stdio.h>
#include <stdlib.h>
#include "util/copyright.h"
-#if defined(linux) || defined(sgi) || defined(CSRG_BASED)
+#if defined(linux) || defined(CSRG_BASED)
#include <getopt.h>
#endif
#include "dbck.h"
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 887612e1..ec9b2b56 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
@@ -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_type_comp.C /main/4 1999/10/14 18:37:58 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_type_comp.C /main/4 1999/10/14 18:37:58 mgreess $
/*
*
* mp_type_comp.cc
@@ -42,7 +42,7 @@
#if defined(linux)
#include <unistd.h>
#endif
-#if defined(sgi) || defined(CSRG_BASED)
+#if defined(CSRG_BASED)
#include <getopt.h>
#endif
#if defined(USL)
diff --git a/cde/lib/tt/bin/ttdbserverd/db_server_svc.C b/cde/lib/tt/bin/ttdbserverd/db_server_svc.C
index 5f55ab02..0972206c 100644
--- a/cde/lib/tt/bin/ttdbserverd/db_server_svc.C
+++ b/cde/lib/tt/bin/ttdbserverd/db_server_svc.C
@@ -24,7 +24,7 @@
//%% (c) Copyright 1993, 1994 International Business Machines Corp.
//%% (c) Copyright 1993, 1994 Sun Microsystems, Inc.
//%% (c) Copyright 1993, 1994 Novell, Inc.
-//%% $TOG: db_server_svc.C /main/9 1999/10/12 10:01:35 mgreess $
+//%% $TOG: db_server_svc.C /main/9 1999/10/12 10:01:35 mgreess $
/*
* @(#)db_server_svc.C 1.54 95/06/07
*
@@ -57,13 +57,13 @@
#include <stdlib.h>
#include <stdio.h>
#include <rpc/pmap_clnt.h>
-#include <isam.h>
+#include <isam.h>
#include <unistd.h>
#include <sys/socket.h>
#include <termios.h>
#include <time.h>
-#if defined(sgi) || defined(CSRG_BASED)
+#if defined(CSRG_BASED)
#include <getopt.h>
#endif
@@ -132,8 +132,8 @@ char _tt_log_file[MAXPATHLEN];
_Tt_db_info _tt_db_table[_TT_MAX_ISFD];
// _tt_refclock is a "pseudo clock" that's just incremented every time
-// a reference is made to an fd; the resulting value is placed
-// the _tt_db_table[fd].reftime field, so we can figure out which
+// a reference is made to an fd; the resulting value is placed
+// the _tt_db_table[fd].reftime field, so we can figure out which
// fd is Least Recently Used when it comes time to re-use one.
int _tt_refclock=0;
time_t _tt_mtab_last_mtime;
diff --git a/cde/lib/tt/bin/ttsession/mp_server.C b/cde/lib/tt/bin/ttsession/mp_server.C
index 34e66de3..d7560d44 100644
--- a/cde/lib/tt/bin/ttsession/mp_server.C
+++ b/cde/lib/tt/bin/ttsession/mp_server.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_server.C /main/10 1999/10/14 18:38:32 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_server.C /main/10 1999/10/14 18:38:32 mgreess $
/*
* @(#)mp_server.C 1.119 95/09/26
*
@@ -53,7 +53,7 @@
#include <sys/resource.h>
#include <unistd.h>
-#if defined(sgi) || defined(CSRG_BASED)
+#if defined(CSRG_BASED)
#include <getopt.h>
#endif
diff --git a/cde/lib/tt/lib/mp/mp_procid.C b/cde/lib/tt/lib/mp/mp_procid.C
index ed46b42a..1fb71103 100644
--- a/cde/lib/tt/lib/mp/mp_procid.C
+++ b/cde/lib/tt/lib/mp/mp_procid.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_procid.C /main/4 1997/07/30 15:43:53 samborn $
+//%% (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_procid.C /main/4 1997/07/30 15:43:53 samborn $
/*
*
* mp_procid.cc -- methods for communicating with active processes
@@ -45,11 +45,6 @@
#include "util/tt_global_env.h"
#include <arpa/inet.h>
-#if defined(sgi)
-#include <CC/libc.h>
-#endif
-
-
_Tt_procid::
_Tt_procid()
{
@@ -60,21 +55,21 @@ _Tt_procid()
_mxdr_stream = (XDR *)0;
}
-
+
_Tt_procid::
~_Tt_procid()
{
}
-//
+//
// Returns the fd which will be used to signal this procid if there are
// new messages for it. -1 means error. This method is only used in
// client mode. This method caches the fd returned from the
// _Tt_stream_socket::fd method. This method has the side-effect that it
// will accept the connection on the socket if not already done. See the
// comments in _Tt_c_procid::set_fd_channel for more details.
-//
+//
int _Tt_procid::
fd()
{
@@ -83,7 +78,7 @@ fd()
} else if (_fd == -1) {
_fd = _socket->fd();
}
-
+
return(_fd);
}
diff --git a/cde/lib/tt/lib/mp/mp_rpc_client.C b/cde/lib/tt/lib/mp/mp_rpc_client.C
index e4276e6f..29a5d2da 100644
--- a/cde/lib/tt/lib/mp/mp_rpc_client.C
+++ b/cde/lib/tt/lib/mp/mp_rpc_client.C
@@ -71,17 +71,12 @@ extern "C" in_addr_t inet_addr(const char *);
#include <arpa/inet.h>
#include <memory.h>
-#if defined(sgi)
-/* SGI's FD_ZERO macro uses bzero() without declaring it. */
-#include <CC/libc.h>
-#endif
-
#include <sys/resource.h>
#include <util/tt_global_env.h>
#include <mp/mp_rpc_fns.h>
-/*
- * Constructs an rpc client.
+/*
+ * Constructs an rpc client.
*/
_Tt_rpc_client::
_Tt_rpc_client(int conn_socket)
@@ -91,7 +86,7 @@ _Tt_rpc_client(int conn_socket)
}
-/*
+/*
* Destroys an rpc client (breaks off connections)
*/
_Tt_rpc_client::
@@ -104,10 +99,10 @@ _Tt_rpc_client::
}
-/*
+/*
* Returns the socket associated with an rpc client. --> it would be
* nice to use this socket rather than open up a new one when signalling
- * procids.
+ * procids.
*/
int _Tt_rpc_client::
socket()
diff --git a/cde/lib/tt/lib/tt_options.h b/cde/lib/tt/lib/tt_options.h
index 61aaa323..d4a4e93a 100644
--- a/cde/lib/tt/lib/tt_options.h
+++ b/cde/lib/tt/lib/tt_options.h
@@ -70,15 +70,12 @@
*
* OPT_BUG_SUNOS_5 -- used to flag special hacks only needed because
* of bugs or quirks in SunOS 5.x.
- *
+ *
* OPT_BUG_HPUX -- used to flag special hacks only needed because
* of bugs or quirks in HP-UX.
- *
+ *
* OPT_BUG_RPCINTR -- used to flag that RPC_INTR is not defined
* in enum clnt_stat.
- *
- * OPT_BUG_SGI -- used to flag special hacks only needed because of
- * bugs or quirks in SGI IRIX.
*
* OPT_BUG_USL -- used to flag special hacks only needed because of
* bugs or quirks in UnixWare, etc.
@@ -87,7 +84,7 @@
* <rcp/xdr.h> defines x_putlong and x_getlong to not take "long*".
*
* OPT_POSIX_SIGNAL -- set to assume posix-style sigaction() call.
- * OPT_BSD_SIGNAL -- set to assume bsd-style signal() call.
+ * OPT_BSD_SIGNAL -- set to assume bsd-style signal() call.
* If *neither* OPT_POSIX_SIGNAL or OPT_BSD_SIGNAL is defined, use
* the old SVR2-style sigset().
*
@@ -127,7 +124,7 @@
* OPT_TAR_HAS_EXCLUDE_OPTION -- set if the system tar command has the X
* option for excluding files, which tttar uses to avoid extracting the
* extra file it bundles into the tar file. If this option is not available,
- * the tttarfile file will appear after extracts, a small flaw but not a
+ * the tttarfile file will appear after extracts, a small flaw but not a
* fatal one.
*
* OPT_HAS_REALPATH -- set if the system provides a realpath() library
@@ -347,17 +344,6 @@
# undef OPT_GARBAGE_THREADS
# endif
-#elif defined(sgi)
-/* these are probably way obsolete now that irix is svr4 based */
-# define 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
-# define OPT_TAR_HAS_EXCLUDE_OPTION
-
#elif defined(ultrix)
# undef OPT_UNIX_SOCKET_RPC
diff --git a/cde/lib/tt/lib/util/tt_port.C b/cde/lib/tt/lib/util/tt_port.C
index 1567a7be..4aa2aaca 100644
--- a/cde/lib/tt/lib/util/tt_port.C
+++ b/cde/lib/tt/lib/util/tt_port.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: tt_port.C /main/5 1999/10/14 19:02:43 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: tt_port.C /main/5 1999/10/14 19:02:43 mgreess $
/* @(#)tt_port.C 1.20 93/09/07
*
* tt_port.cc
@@ -79,7 +79,7 @@ extern "C" {
# include <stdlib.h> // atol()
#endif
-#if defined(OPT_BUG_SGI) || defined(OPT_BUG_AIX)
+#if defined(OPT_BUG_AIX)
extern "C" {extern int getdtablesize(void);}
#endif
diff --git a/cde/programs/dtdocbook/tcl/tclUnixPort.h b/cde/programs/dtdocbook/tcl/tclUnixPort.h
index 9405a9af..705c90b9 100644
--- a/cde/programs/dtdocbook/tcl/tclUnixPort.h
+++ b/cde/programs/dtdocbook/tcl/tclUnixPort.h
@@ -418,9 +418,6 @@ EXTERN int gettimeofday _ANSI_ARGS_((struct timeval *tp,
* Variables provided by the C library:
*/
-#if defined(_sgi) || defined(__sgi)
-#define environ _environ
-#endif
extern char **environ;
/*
diff --git a/cde/programs/dtinfo/DtMmdb/utility/funcs.h b/cde/programs/dtinfo/DtMmdb/utility/funcs.h
index 89261a22..10ba41ab 100644
--- a/cde/programs/dtinfo/DtMmdb/utility/funcs.h
+++ b/cde/programs/dtinfo/DtMmdb/utility/funcs.h
@@ -44,7 +44,7 @@
* HAL COMPUTER SYSTEMS INTERNATIONAL, LTD.
* 1315 Dell Avenue
* Campbell, CA 95008
- *
+ *
*/
@@ -56,7 +56,7 @@
!defined(CSRG_BASED) && !defined(sun)
#include <libc.h>
#endif
-#if defined(hpux) || defined(sgi) || defined(USL) ||defined(__osf__) || \
+#if defined(hpux) || defined(USL) ||defined(__osf__) || \
defined(linux) || defined(CSRG_BASED) || defined(sun)
#include <unistd.h>
#else
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/dtinfogen b/cde/programs/dtinfo/dtinfogen/infolib/etc/dtinfogen
index ccd014f1..3d32fbdd 100755
--- a/cde/programs/dtinfo/dtinfogen/infolib/etc/dtinfogen
+++ b/cde/programs/dtinfo/dtinfogen/infolib/etc/dtinfogen
@@ -176,17 +176,12 @@ case "$OS" in
HP-UX*)
ARCH=hpux
;;
-
- IRIX*)
- ARCH=irix
- LINKTESTFLAG="-l"
- ;;
-
+
OSF1*)
ARCH=osf1
LINKTESTFLAG="-L"
;;
-
+
SunOS\ 4.1*)
ARCH=sunos
;;
diff --git a/cde/programs/dtksh/ksh93/src/cmd/ksh93/README b/cde/programs/dtksh/ksh93/src/cmd/ksh93/README
index db7f15af..5dfa85f9 100644
--- a/cde/programs/dtksh/ksh93/src/cmd/ksh93/README
+++ b/cde/programs/dtksh/ksh93/src/cmd/ksh93/README
@@ -150,8 +150,6 @@ signifies that ksh has been installed as /bin/sh on this machine.
System V Release 3 on Counterpoint C19
System V Release 4 on AT&T Intel 486.
System V Release 4 on NCR 4850 Intel 486.
- IRIX Release 4.0.? System V on SGI-MIPS.
- IRIX Release 5.1 System V on SGI-MIPS.
System V Release 3.2 on 3B2.
UTS 5.2.6 on Amdahl 3090,5990,580.
System V Release 3.2 on i386.
diff --git a/cde/programs/dtksh/ksh93/src/cmd/ksh93/bltins/typeset.c b/cde/programs/dtksh/ksh93/src/cmd/ksh93/bltins/typeset.c
index 04a217bc..f3c131aa 100644
--- a/cde/programs/dtksh/ksh93/src/cmd/ksh93/bltins/typeset.c
+++ b/cde/programs/dtksh/ksh93/src/cmd/ksh93/bltins/typeset.c
@@ -628,7 +628,7 @@ int b_builtin __PARAM__((int argc,char *argv[],__V_ *extra), (argc, argv, extra)
addr = 0;
for(n=(nlib?nlib:dlete); --n>=0;)
{
- /* (char*) added for some sgi-mips compilers */
+ /* (char*) added for some sgi-mips compilers */
if(dlete || (addr = (Fptr_t)dlsym(liblist[n],stakptr(flag))))
{
if(sh_addbuiltin(arg, addr,0) < 0)
diff --git a/cde/programs/dtksh/ksh93/src/cmd/ksh93/include/terminal.h b/cde/programs/dtksh/ksh93/src/cmd/ksh93/include/terminal.h
index 8d6a2792..ea77f43f 100644
--- a/cde/programs/dtksh/ksh93/src/cmd/ksh93/include/terminal.h
+++ b/cde/programs/dtksh/ksh93/src/cmd/ksh93/include/terminal.h
@@ -111,14 +111,6 @@
# define tcsetpgrp _SYS_tcsetpgrp
# define cfgetospeed _SYS_cfgetospeed
# include <termios.h>
-# if __sgi__ || sgi /* special hack to eliminate ^M problem */
-# ifndef ECHOCTL
-# define ECHOCTL ECHOE
-# endif /* ECHOCTL */
-# ifndef CNSUSP
-# define CNSUSP CNSWTCH
-# endif /* CNSUSP */
-# endif /* sgi */
# ifdef _NEXT_SOURCE
# define _lib_tcgetattr 1
# define _lib_tcgetpgrp 1
diff --git a/cde/programs/dtksh/ksh93/src/lib/lib0ast/hostinfo.sh b/cde/programs/dtksh/ksh93/src/lib/lib0ast/hostinfo.sh
index c9892f74..d1c477be 100644
--- a/cde/programs/dtksh/ksh93/src/lib/lib0ast/hostinfo.sh
+++ b/cde/programs/dtksh/ksh93/src/lib/lib0ast/hostinfo.sh
@@ -291,17 +291,6 @@ main()
;;
esac
;;
- IRIX*|irix*)
- type=sgi.mips
- case $arch in
- [a-zA-Z][a-zA-Z][0-9][0-9]*|[a-zA-Z][a-zA-Z]1[3-9]*)
- type=${type}2
- ;;
- [a-zA-Z][a-zA-Z][0-9]*)
- type=${type}1
- ;;
- esac
- ;;
OSx*|SMP*|pyramid)
type=pyr
;;
diff --git a/cde/programs/dtksh/ksh93/src/lib/lib0ast/hosttype.tst b/cde/programs/dtksh/ksh93/src/lib/lib0ast/hosttype.tst
index fe318597..64d62b0c 100644
--- a/cde/programs/dtksh/ksh93/src/lib/lib0ast/hosttype.tst
+++ b/cde/programs/dtksh/ksh93/src/lib/lib0ast/hosttype.tst
@@ -1,5 +1,4 @@
hp.pa hostname 9000/730 hp9000s700 HP-UX hostname A.09.01 A
linux.i386 hostname i586 i386 linux hostname 1.1.59 #1
-sgi.mips2 hostname.domain IP22 mips IRIX hostname 5.2 02282016
sol.sun4 hostname.domain sun4 sparc SunOS hostname.domain 5.4 Generic_101945-13
sun4 hostname.domain sun4 sparc SunOS hostname.domain 4.1.1 1 sun4c
diff --git a/cde/programs/dtudcfonted/libfal/_falSetLocale.c b/cde/programs/dtudcfonted/libfal/_falSetLocale.c
index 59d66479..ab5ef13f 100644
--- a/cde/programs/dtudcfonted/libfal/_falSetLocale.c
+++ b/cde/programs/dtudcfonted/libfal/_falSetLocale.c
@@ -161,7 +161,7 @@ _fallcMapOSLocaleName(osname, siname)
char *osname;
char *siname;
{
-#if defined(hpux) || defined(CSRG_BASED) || defined(sun) || defined(SVR4) || defined(sgi) || defined(__osf__) || defined(AIXV3) || defined(ultrix) || defined(WIN32)
+#if defined(hpux) || defined(CSRG_BASED) || defined(sun) || defined(SVR4) || defined(__osf__) || defined(AIXV3) || defined(ultrix) || defined(WIN32)
#ifdef hpux
#define SKIPCOUNT 2
#define STARTCHAR ':'
diff --git a/cde/programs/nsgmls/ExtendEntityManager.C b/cde/programs/nsgmls/ExtendEntityManager.C
index c23653da..5b4ca938 100644
--- a/cde/programs/nsgmls/ExtendEntityManager.C
+++ b/cde/programs/nsgmls/ExtendEntityManager.C
@@ -643,7 +643,7 @@ Xchar ExternalInputSource::fill(Messenger &mgr)
unsigned minBytesPerChar = decoder_->minBytesPerChar();
if (nLeftOver_ == 0 && minBytesPerChar >= sizeof(Char)) {
// In this case we want to do decoding in place.
- // FIXME It might be a win on some systems (Irix?) to arrange that the
+ // FIXME It might be a win on some systems to arrange that the
// read buffer is on a page boundary.
if (keepSize >= size_t(-1)/sizeof(Char) - (align - 1) - insertRS_)
--
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
