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

remove OSF1 support

Browse Source
This commit is contained in:
chase
2018-05-24 14:50:03 -05:00
committed by Jon Trulson
parent 3c1736f077
commit 164e695cd0
325 changed files with 290 additions and 9980 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
cde/lib/DtHelp/CanvasSegP.h
View File

@@ -235,10 +235,6 @@ typedef struct _dtCvLine {
_DtCvPointer data;
} _DtCvLine;
#ifdef __osf__
typedef struct _dtCvSegment * _DtCvSegmentPointer;
#endif
typedef struct _dtCvContainer {
char *id;
char *justify_char;
@@ -257,11 +253,7 @@ typedef struct _dtCvContainer {
_DtCvUnit tmargin;
_DtCvUnit bmargin;
_DtCvLine bdr_info;
#ifdef __osf__
_DtCvSegmentPointer seg_list;
#else
struct _dtCvSegment *seg_list;
#endif
} _DtCvContainer;
typedef struct _DtCvString {
@@ -310,19 +302,11 @@ struct _dtCvSegPts {
int len;
};
#ifdef __osf__
typedef struct _dtCvLinkDb * _DtCvLinkDbPointer;
#endif
typedef struct _dtCvTopicInfo {
char *id_str;
struct _dtCvSegment *seg_list;
_DtCvPointInfo **mark_list;
#ifdef __osf__
_DtCvLinkDbPointer link_data;
#else
struct _dtCvLinkDb *link_data;
#endif
} _DtCvTopicInfo;
typedef struct _dtCvStringClientData {

2
cde/lib/DtHelp/GlobSearch.c
View File

@@ -3122,7 +3122,7 @@ static void StartSearchCB(
for the SunOS 5.3 optimized executable. It isn't a problem for the
non-optimized or debuggable versions or any versions on AIX 3.2 or
HP-UX 9.05. */
#if !defined(sun) && !defined(__osf__)
#if !defined(sun)
n = 0;
XtSetArg(args[n],XmNeditable,False); n++;
XtSetArg(args[n],XmNcursorPositionVisible,False); n++;

563
cde/lib/DtHelp/OSF1.lcx
View File

@@ -1,563 +0,0 @@
!
! *****************************************************************
! * *
! * Copyright (c) Digital Equipment Corporation, 1991, 1995 *
! * *
! * All Rights Reserved. Unpublished rights reserved under *
! * the copyright laws of the United States. *
! * *
! * The software contained on this media is proprietary to *
! * and embodies the confidential technology of Digital *
! * Equipment Corporation. Possession, use, duplication or *
! * dissemination of the software and media is authorized only *
! * pursuant to a valid written license from Digital Equipment *
! * Corporation. *
! * *
! * *
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS *
! * OR IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE *
! * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A *
! * PARTICULAR PURPOSE. *
! * *
! * *
! * RESTRICTED RIGHTS LEGEND Use, duplication, or disclosure *
! * by the U.S. Government is subject to restrictions as set *
! * forth in Subparagraph (c)(1)(ii) of DFARS 252.227-7013, *
! * or in FAR 52.227-19, as applicable. *
! * *
! *****************************************************************
!
!
! HISTORY
!
! @(#)$XConsortium: OSF1.lcx /main/4 1996/10/28 13:57:14 drk $
!
!!!!!!!!!!!!!! OSF1 Locale-Related Translations !!!!!!!!!!!!!!
! File: OSF1.lcx
! Default location: /usr/dt/config/svc/OSF1.lcx
! Purpose:
! Define the OSF1-specific set of locale-related translations.
! Description:
! This file contains the set of all locale-related translations
! that can occur during _DtLcxXlateOpToStd() and _DtLcxStdToOp()
! calls on OSF1 platforms. Note that platform-specific tables may
! include more than one translation to and from CDE standard
! strings if they can be distinguished by version, operation, or
! pattern matching.
!
! It is important that additional CDE standard strings only
! be created by the CDE owner of the _DtLcx translation service
! and NOT be created by an individual vendor or user. This be because
! the purpose of adopting a set of CDE standard strings is to
! support interoperability across platforms. If individual vendors
! add their own "standard" strings and these strings are not
! known on other platforms, then the goal of interoperability
! will be defeated.
!
! If you feel that a new CDE standard string is needed,
! contact your CDE representative/vendor with a specific
! proposal and justification and have them forward it to
! the owner of the CDE _DtLcx service.
!
! Note that it is allowed for vendors and users to add new
! operations for which translations are specified and which
! utilize the standard strings. If the operations are of
! general utility, please bring them to the attention of
! your CDE representative/vendor for forwarding to the
! _DtLcx owner.
! Invoked by:
! This table is used by the _DtLcx translation service
! Product: @(#)Cde1
! Revision: $XConsortium: OSF1.lcx /main/4 1996/10/28 13:57:14 drk $
! Defects:
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!!!!!!!!!!!!!!!! translation specification syntax !!!!!!!!!!!!!!!!!!!
! Introductory fields:
! ====================
! The _DtLcx translation specifications have a fixed number of
! introductory fields followed by a several standard value
! fields and the operation-specific value.
! The introductory fields are:
! <platform>.<version range>.<operation(s)>.<kind>
!
! Platform generally is the same string as uname(1) -s.
! Version range utilizes normalized version numbers that
! are acquired using the 'version' translations.
! Operations are one or more comma-separated strings that
! uniquely identify the operation associated with the
! operation-specific value. This string is specified
! as part of the request for a translation.
!
! Kinds of translations allow the mechanism to support several modes
! of operation, each useful for different purposes. When
! reading or writing a specification, pay particular attention
! to the kind of specification, as this guides the usage of it.
!
! Specification kinds:
! .=. means a valid bi-directional translation requiring the op-value
! in the translation specification to exactly match the op-value of
! the call to _DtLcxXlateOpToStd(), e.g. foo matches only foo
! .~. means a valid bi-directional translation requiring the op-value
! in the translation specification to match the beginning of the
! op-value of the call to _DtLcxXlateOpToStd(), e.g. foo matches
! foo@bar. This is often useful, e.g. for operation-specific
! locale strings that may also contain modifier suffixes.
! .>. means only from standard to op-specific (generally a
! compatibility translation, meaning on op-specific value
! that will work for the standard, although that is not
! the straight mapping)
! .<. means only from op-specific to standard (generally a
! regex in the op-value which is used to map a class of
! op values to a standard value)
! .0. means that translation is not supported and if a translation
! request matches the specification, the request will fail.
!
! Standard values:
! ================
! _DtLcx defines the order of the standard values in the
! translations it utilizes. All translation specifications
! must adhere to this order.
! <std lang_terr>.<std codeset>.<std modifier>
! In CDE 1.0, no modifiers are standard and that
! portion of the table is unspecified. This means
! that no CDE standard modifiers are available across
! platforms. Operations that use only the <std codeset>
! should specify the wildcard character ("?") for the
! <std lang_terr> value.
!
! Operation-specific value:
! =========================
! The operation-specific value is a string that is used
! according to the kind of translation. The syntax is
! : <op-string>
! or : "<op-string>", if it contains white space
!
! Filling in the table of translations:
! =====================================
! The person preparing the translation table should know
! the minimum version of the target platform that is
! be supported. For example, assume that we must
! complete the table for all versions 9.00 and higher.
!
! The objective is then to provide two sets of translations:
! a full set of translations from CDE standard locales to
! valid platform locales, and a full set of translations
! from valid platform locales to some or all CDE standard
! locales.
!
! Translations from CDE standard locales to valid platform
! locales must use the .~. .=. or .>. mappings. When there
! is a 1:1 mapping between a CDE locale and a platform locale,
! use the .~. or .=. mapping. See the comment below to
! decide which to use. When there is no 1:1 mapping between
! CDE locale and platform locale, use the .>. mapping. This
! provides a valid translation from the CDE locale to the
! best-suitable platform locale, but never translates from
! that platform locale to the CDE locale.
!
! Translations from every platform locale to the appropriate
! CDE locale must use the .~. .=. or .<. mappings.
! When there is a 1:1 mapping between a platform locale and
! a CDE standard locale, use the .~. or .=. mapping. See the
! comment below to decide which to use. If there is a 1:1
! mapping, but the platform locale pattern uses a regular
! expression, or if more than one platform locale can
! be translated to one CDE standard locale, the .<. mapping must
! be used.
!
! If no appropriate CDE standard locale can be found, you have
! identified the need for a new CDE standard locale. Refer to
! the instructions at the head of this file for how to go about
! registering a new CDE standard locale. You should not create
! a new "standard" locale (the left hand side of the translation
! specification) without registering it with CDE, because this
! will hinder the free exchange of information across locales
! and platforms.
!
! The .=. and .~. mappings are similar. The difference is
! that the .=. mapping requires an exact string match between
! the platform locale and the string provided to the
! translation routine. Generally speaking, this mapping
! is risky unless exact matchings can be guaranteed in
! all DtLcx clients for the particular operation in question.
! The .~. mapping is to be preferred, but the .=. translation
! is useful in limited situations, where similar strings may
! occur.
!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
! define this resource to dump debug/test info
!*debugDtXlate: True
!!!!!!!!!!!!!!!! OSF1 Version Identificaton !!!!!!!!!!!!!!!!!
! These translations are used by the _DtXlateGetXlateEnv()
! call to determine the version number to use.
!
! To understand the translation, realize that the
! operation-specific regexp(5) pattern on the right
! hand side is matched against the strings returned
! by uname(2). The best match determines the "normalized"
! version number of the platform, which should range from
! 001 and up. By convention, major release numbers
! map to centuries and minor release numbers to within
! the century.
!
! To determine the string that the regular expression on the
! right hand side is matching against, use uname(1) and run
! 'uname -r' and 'uname -v' and note the strings. During execution,
! the strings returned by this command are retrieved and
! concatenated "rv"--in that order, no extra spaces.
! This is the string that the pattern must match.
!
! Sometimes this string may not be intuitive. For example,
! note that AIX 3.2 returns 2 for 'uname -r' and 3 for 'uname -v'.
! So the pattern string must be 23, not 32. Do not go by
! the order of 'uname -rv' or 'uname -vr', as that is not used.
!!!
! Define string for OSF/1 Platinum
OSF1.?.version.<.400: "[A-Z]4\\..*"
! Define string for OSF/1 Gold minor
OSF1.?.version.<.320: "[A-Z]3\\.2.*" !! any OSF/1 GM version
! Define string for OSF/1 Gold
OSF1.?.version.<.300: "[A-Z]3\\..*"
!!!!!!!!!!!!!!!! OSF1-specific setlocale translations !!!!!!!!!!!!!!!!!!!
! These translations are for the string returned by the
! getlocale() or setlocale(LC_xxx,NULL) operations, but not
! setlocale(LC_ALL,NULL) operation.
!
! It provides translations from OSF1 operation-specific
! to CDE standard strings and back again.
!
! Some language,territory combinations have the following comments:
! (1) These ISO territory names may be subject to change
! However, their CDE names will continue to be supported
! (2) No ISO "territory" name exists for the Arabic-speaking regions of the
! world as a whole. Vendors have sometimes supplied their own.
! Those names, when conformant to the ISO model, will be adopted for CDE.
!
!Platform Operation Lang_Terr Op-Value Language,Territory Who has
!--- --------- ----- -------- ------------------ -------
! Version Kind Codeset
! ---- - ---------
! setlocales Compliance
OSF1.400+.setlocale.~.C.ISO-8859-1: C ! setlocales compliance ,IBM, HP, Sun ,
OSF1.400+.setlocale.~.POSIX.ISO-8859-1: POSIX ! setlocales compliance ,IBM, HP, Sun ,
! W European/Americas, Latin 1 codeset
OSF1.400+.setlocale.~.da_DK.ISO-8859-1: da_DK.ISO8859-1 ! Danish, Denmark XoJIG,IBM, HP, ,
OSF1.400+.setlocale.>.de_AT.ISO-8859-1: de_DE.ISO8859-1 ! German,Austria XoJIG, , , ,
OSF1.400+.setlocale.~.de_CH.ISO-8859-1: de_CH.ISO8859-1 ! German,Switzerland XoJIG,IBM, , ,
OSF1.400+.setlocale.~.de_DE.ISO-8859-1: de_DE.ISO8859-1 ! German, Germany XoJIG,IBM, HP, Sun ("de"),
OSF1.400+.setlocale.>.en_AU.ISO-8859-1: en_GB.ISO8859-1 ! English,Australia , , , ,
OSF1.400+.setlocale.>.en_CA.ISO-8859-1: en_US.ISO8859-1 ! English,Canada XoJIG, , , ,
OSF1.400+.setlocale.>.en_DK.ISO-8859-1: en_GB.ISO8859-1 ! English, Denmark XoJIG, , , ,
OSF1.400+.setlocale.~.en_GB.ISO-8859-1: en_GB.ISO8859-1 ! English, U.K. XoJIG,IBM, HP, ,
OSF1.400+.setlocale.>.en_JP.ISO-8859-1: en_US.ISO8859-1 ! English, Japan XoJIG,IBM, , ,
OSF1.400+.setlocale.>.en_IE.ISO-8859-1: en_GB.ISO8859-1 ! English, Ireland XoJIG, , , ,
OSF1.400+.setlocale.>.en_MY.ISO-8859-1: en_US.ISO8859-1 ! English,Malaysia , , , ,
OSF1.400+.setlocale.>.en_NZ.ISO-8859-1: en_GB.ISO8859-1 ! English,New Zealand , , , ,
OSF1.400+.setlocale.>.en_KR.ISO-8859-1: en_US.ISO8859-1 ! English,Korea , , , ,
OSF1.400+.setlocale.>.en_TW.ISO-8859-1: en_US.ISO8859-1 ! English,Taiwan , , , ,
OSF1.400+.setlocale.~.en_US.ISO-8859-1: en_US.ISO8859-1 ! English, USA XoJIG,IBM, HP, Sun ,
OSF1.400+.setlocale.>.es_AR.ISO-8859-1: es_ES.ISO8859-1 ! Spanish, Argentina , , , Sun ,
OSF1.400+.setlocale.>.es_BO.ISO-8859-1: es_ES.ISO8859-1 ! Spanish, Bolivia , , , Sun
OSF1.400+.setlocale.>.es_CL.ISO-8859-1: es_ES.ISO8859-1 ! Spanish, Chile , , , Sun ,
OSF1.400+.setlocale.>.es_CO.ISO-8859-1: es_ES.ISO8859-1 ! Spanish, Columbia , , , Sun
OSF1.400+.setlocale.>.es_CR.ISO-8859-1: es_ES.ISO8859-1 ! Spanish, Costa Rica , , , Sun
OSF1.400+.setlocale.>.es_EC.ISO-8859-1: es_ES.ISO8859-1 ! Spanish, Ecuador , , , Sun
OSF1.400+.setlocale.~.es_ES.ISO-8859-1: es_ES.ISO8859-1 ! Spanish, Spain XoJIG,IBM, HP, Sun ,
OSF1.400+.setlocale.~.ca_ES.ISO-8859-1: ca_ES.ISO8859-1 ! Catalan, Spain XoJIG,IBM, HP, Sun , , DEC
OSF1.400+.setlocale.>.es_GT.ISO-8859-1: es_ES.ISO8859-1 ! Spanish, Guatemala , , , Sun
OSF1.400+.setlocale.>.es_MX.ISO-8859-1: es_ES.ISO8859-1 ! Spanish, Mexico , , , Sun ,
OSF1.400+.setlocale.>.es_PE.ISO-8859-1: es_ES.ISO8859-1 ! Spanish, Peru , , , Sun
OSF1.400+.setlocale.>.es_UY.ISO-8859-1: es_ES.ISO8859-1 ! Spanish, Uruguay , , , Sun
OSF1.400+.setlocale.>.es_VE.ISO-8859-1: es_ES.ISO8859-1 ! Spanish, Venezuela , , , Sun ,
! OSF1.400+.setlocale.>.et_EE.ISO-8859-1: ! Estonian, Estonia XoJIG,
OSF1.400+.setlocale.~.fi_FI.ISO-8859-1: fi_FI.ISO8859-1 ! Finnish, Finland XoJIG,IBM, HP, ,
! OSF1.400+.setlocale.>.fo_FO.ISO-8859-1: ! Faroese, Faeroe Island XoJIG,
OSF1.400+.setlocale.~.fr_BE.ISO-8859-1: fr_BE.ISO8859-1 ! French,Belgium XoJIG, , , ,
OSF1.400+.setlocale.~.fr_CA.ISO-8859-1: fr_CA.ISO8859-1 ! French, Canada XoJIG,IBM, HP, ,
OSF1.400+.setlocale.~.fr_CH.ISO-8859-1: fr_CH.ISO8859-1 ! French, Switzerland XoJIG,IBM, , ,
OSF1.400+.setlocale.~.fr_FR.ISO-8859-1: fr_FR.ISO8859-1 ! French, France XoJIG,IBM, HP, Sun ("fr"),
OSF1.400+.setlocale.~.is_IS.ISO-8859-1: is_IS.ISO8859-1 ! Icelandic, Iceland XoJIG,IBM, HP, ,
OSF1.400+.setlocale.>.it_CH.ISO-8859-1: it_IT.ISO8859-1 ! Italian,Switzerland , , , ,
OSF1.400+.setlocale.~.it_IT.ISO-8859-1: it_IT.ISO8859-1 ! Italian, Italy XoJIG,IBM, HP, Sun ("it"),
! OSF1.400+.setlocale.>.kl_GL.ISO-8859-1: ! Greenlandic, Greenland XoJIG,
! OSF1.400+.setlocale.>.lt_LT.ISO-8859-1: ! Lithuanian, Lithuania XoJIG,
! OSF1.400+.setlocale.>.lv_LV.ISO-8859-1: ! Latvian, Latvia XoJIG,
OSF1.400+.setlocale.~.nl_BE.ISO-8859-1: nl_BE.ISO8859-1 ! Dutch, Belgium XoJIG,IBM, , ,
OSF1.400+.setlocale.~.nl_NL.ISO-8859-1: nl_NL.ISO8859-1 ! Dutch, The Netherlands XoJIG,IBM, HP, ,
OSF1.400+.setlocale.~.no_NO.ISO-8859-1: no_NO.ISO8859-1 ! Norwegian, Norway XoJIG,IBM, HP, ,
OSF1.400+.setlocale.>.pt_BR.ISO-8859-1: pt_PT.ISO8859-1 ! Portuguese,Brazil , , , ,
OSF1.400+.setlocale.~.pt_PT.ISO-8859-1: pt_PT.ISO8859-1 ! Portuguese, Portugal XoJIG,IBM, HP, ,
OSF1.400+.setlocale.>.sv_FI.ISO-8859-1: sv_SE.ISO8859-1 ! Swedish, Finland XoJIG,
OSF1.400+.setlocale.~.sv_SE.ISO-8859-1: sv_SE.ISO8859-1 ! Swedish, Sweden XoJIG,IBM, HP, Sun ("sv"),
! E European
OSF1.400+.setlocale.~.cs_CS.ISO-8859-2: cs_CZ.ISO8859-2 ! Czech(1) ,IBM, HP
! OSF1.400+.setlocale.>.hr_HR.ISO-8859-2: ! Croatian, Croatia ,IBM
OSF1.400+.setlocale.~.hu_HU.ISO-8859-2: hu_HU.ISO8859-2 ! Hungarian, Hungry XoJIG,IBM, HP
OSF1.400+.setlocale.~.pl_PL.ISO-8859-2: pl_PL.ISO8859-2 ! Polish, Poland XoJIG,IBM, HP
! OSF1.400+.setlocale.>.ro_RO.ISO-8859-2: ! Rumanian, Romania XoJIG,IBM, HP
! OSF1.400+.setlocale.>.sh_YU.ISO-8859-2: ! Serbocroatian, Yugoslavia(1) ,IBM, HP
OSF1.400+.setlocale.>.sl_CS.ISO-8859-2: sl_SI.ISO8859-2 ! Slovenian , , HP, , , DEC
OSF1.400+.setlocale.~.si_SI.ISO-8859-2: sl_SI.ISO8859-2 ! Slovenian ,IBM, , , , DEC
OSF1.400+.setlocale.~.sk_SK.ISO-8859-2: sk_SK.ISO8859-2 ! Slovak ,IBM
! N European
OSF1.400+.setlocale.~.lt_LT.ISO-8859-4: lt_LT.ISO8859-4 ! Lithuanian, Lithuania , , , , , DEC
! Cyrillic
! OSF1.400+.setlocale.>.bg_BG.ISO-8859-5: ! Bulgarian, Bulgaria ,IBM, HP
! OSF1.400+.setlocale.>.mk_MK.ISO-8859-5: ! Macedonian ,IBM
OSF1.400+.setlocale.~.ru_RU.ISO-8859-5: ru_RU.ISO8859-5 ! Russian(1) ,IBM,
OSF1.400+.setlocale.>.ru_SU.ISO-8859-5: ru_RU.ISO8859-5 ! Russian(1) , , HP
! OSF1.400+.setlocale.>.sp_YU.ISO-8859-5: ! Serbian,Yugoslavia(1) ,IBM
! Arabic
! OSF1.400+.setlocale.>.ar_DZ.ISO-8859-6: ! Arabic(2) , , HP
! OSF1.400+.setlocale.>.ar_SA.ISO-8859-6: ! Arabic(2) ,IBM, HP
! Hebrew
OSF1.400+.setlocale.~.iw_IL.ISO-8859-8: iw_IL.ISO8859-8 ! Hebrew, Israel ,IBM, HP
! Greek
OSF1.400+.setlocale.~.el_GR.ISO-8859-7: el_GR.ISO8859-7 ! Greek, Greece ,IBM, HP
! Turkish
OSF1.400+.setlocale.~.tr_TR.ISO-8859-9: tr_TR.ISO8859-9 ! Turkish, Turkey ,IBM, HP
! East Asia
OSF1.400+.setlocale.~.ja_JP.EUC-JP: ja_JP ! Japanese, Japan ,IBM, HP, Sun ("ja"),
OSF1.400+.setlocale.~.ja_JP.IBM-932: ja_JP.SJIS ! Japanese, Japan ,IBM
OSF1.400+.setlocale.>.ja_JP.HP-SJIS: ja_JP.SJIS ! Japanese, Japan aka japanese 15 , , HP,
OSF1.400+.setlocale.~.ja_JP.DEC-KANJI: ja_JP.deckanji ! Japanese, Japan , , , , , DEC
OSF1.400+.setlocale.~.ja_JP.DEC-SKANJI: ja_JP.sdeckanji ! Japanese, Japan , , , , , DEC
OSF1.400+.setlocale.~.ko_KR.EUC-KR: ko_KR ! Korean, Korea , , , , , DEC
OSF1.400+.setlocale.~.zh_CN.EUC-CN: zh_CN ! Chinese, China ,IBM, , Sun ("zh"),
OSF1.400+.setlocale.>.zh_CN.HP-15CN: zh_CN ! Chinese, China , , HP
OSF1.400+.setlocale.~.zh_TW.DEC-HANYU: zh_TW ! Chinese, Taiwan , , , , , DEC
OSF1.400+.setlocale.~.zh_TW.DEC-BIG5: zh_TW.big5 ! Chinese, Taiwan , , , , , DEC
OSF1.400+.setlocale.~.zh_TW.EUC-TW: zh_TW.eucTW ! Chinese, Taiwan ,IBM, HP, Sun ,
OSF1.400+.setlocale.~.zh_HK.EUC-CN: zh_HK.dechanzi ! Chinese, Hong Kong , , , , , DEC
OSF1.400+.setlocale.~.zh_HK.DEC-HANYU: zh_HK.dechanyu ! Chinese, Hong Kong , , , , , DEC
OSF1.400+.setlocale.~.zh_HK.DEC-BIG5: zh_HK.big5 ! Chinese, Hong Kong , , , , , DEC
OSF1.400+.setlocale.~.zh_HK.EUC-TW: zh_HK.eucTW ! Chinese, Hong Kong , , , , , DEC
! OSF1.400+.setlocale.>.zh_TW.HP-BIG5: ! Chinese, Taiwan , , HP, ,
! OSF1.400+.setlocale.>.zh_TW.HP-CCDC: ! Chinese, Taiwan , , HP, ,
! OSF1.400+.setlocale.>.ja_JP.HP-KANA8: ! Japanese, Japan , , HP, ,
! Thai
OSF1.400+.setlocale.~.th_TH.TIS-620: th_TH ! Thai, Thailand ,IBM, HP
! codesets supported for iconv(1,3) & nl_langinfo and above
OSF1.400+.iconv1,iconv3,nl_langinfo(CODESET).=.?.ISO-8859-1: ISO8859-1
OSF1.400+.iconv1,iconv3,nl_langinfo(CODESET).=.?.ISO-8859-2: ISO8859-2
OSF1.400+.iconv1,iconv3,nl_langinfo(CODESET).=.?.ISO-8859-4: ISO8859-4
OSF1.400+.iconv1,iconv3,nl_langinfo(CODESET).=.?.ISO-8859-5: ISO8859-5
OSF1.400+.iconv1,iconv3,nl_langinfo(CODESET).=.?.ISO-8859-6: ISO8859-6
OSF1.400+.iconv1,iconv3,nl_langinfo(CODESET).=.?.ISO-8859-7: ISO8859-7
OSF1.400+.iconv1,iconv3,nl_langinfo(CODESET).=.?.ISO-8859-8: ISO8859-8
OSF1.400+.iconv1,iconv3,nl_langinfo(CODESET).=.?.ISO-8859-9: ISO8859-9
OSF1.400+.iconv1,iconv3.=.?.EUC-KR: eucKR
OSF1.400+.nl_langinfo(CODESET).=.?.EUC-KR: KSC5601
OSF1.400+.iconv1,iconv3,nl_langinfo(CODESET).=.?.EUC-JP: eucJP
OSF1.400+.iconv1,iconv3,nl_langinfo(CODESET).=.?.DEC-KANJI: deckanji
OSF1.400+.iconv1,iconv3,nl_langinfo(CODESET).=.?.DEC-SKANJI: sdeckanji
OSF1.400+.iconv1,iconv3,nl_langinfo(CODESET).=.?.EUC-TW: eucTW
OSF1.400+.iconv1,iconv3,nl_langinfo(CODESET).=.?.DEC-HANYU: dechanyu
OSF1.400+.iconv1,iconv3,nl_langinfo(CODESET).=.?.DEC-BIG5: big5
OSF1.400+.iconv1,iconv3,nl_langinfo(CODESET).=.?.EUC-CN: dechanzi
OSF1.400+.iconv1,iconv3,nl_langinfo(CODESET).>.?.HP-15CN: dechanzi
OSF1.400+.iconv1,iconv3,nl_langinfo(CODESET).=.?.IBM-932: SJIS
OSF1.400+.iconv1,iconv3,nl_langinfo(CODESET).>.?.HP-SJIS: SJIS
OSF1.400+.iconv1,iconv3,nl_langinfo(CODESET).=.?.TIS-620: TACTIS
! codesets supported for iconv(1,3) only
OSF1.400+.iconv1,iconv3.=.?.ISO-2022-JP: ISO-2022-JP
OSF1.400+.iconv1,iconv3.=.?.ISO-2022-KR: ISO-2022-KR
! codesets not supported for either iconv(1,3) or nl_langinfo
! OSF1.?.iconv1,iconv3.~.?.UCS-2:
! OSF1.?.iconv1,iconv3.~.?.UTF-8:
! OSF1.?.iconv1,iconv3.~.?.HP-ARABIC8:
! OSF1.?.iconv1,iconv3.~.?.HP-GREEK8:
! OSF1.?.iconv1,iconv3.~.?.HP-HEBREW8
! OSF1.?.iconv1,iconv3.~.?.HP-ROMAN8:
! OSF1.?.iconv1,iconv3.~.?.HP-TURKISH8:
! OSF1.?.iconv1,iconv3.~.?.HP-KANA8:
! OSF1.?.iconv1,iconv3.~.?.ISO-2022-TW:
! OSF1.?.iconv1,iconv3.~.?.HP-CCDC:
! OSF1.?.iconv1,iconv3.~.?.HP-BIG5:
! OSF1.?.iconv1,iconv3.~.?.ISO-2022-CN:
! OSF1.?.iconv1,iconv3.~.?.IBM-437:
! OSF1.?.iconv1,iconv3.~.?.IBM-850:
! OSF1.?.iconv1,iconv3.~.?.IBM-856:
! OSF1.?.iconv1,iconv3.~.?.IBM-1046:
! multibyte codesets
! This translation provides an alternative to a call to
! using setlocale() and MB_CUR_MAX to determine this.
OSF1.?.multibyte.=.?.EUC-KR: 3
OSF1.?.multibyte.=.?.HP-SJIS: 2
OSF1.?.multibyte.=.?.IBM-932: 2
OSF1.?.multibyte.=.?.EUC-JP: 3
OSF1.?.multibyte.=.?.DEC-KANJI: 2
OSF1.?.multibyte.=.?.DEC-SKANJI: 3
! OSF1.?.multibyte.~.?.HP-CCDC: 2
! OSF1.?.multibyte.~.?.HP-BIG5: 2
OSF1.?.multibyte.=.?.EUC-TW: 4
OSF1.?.multibyte.=.?.DEC-HANYU: 4
OSF1.?.multibyte.=.?.DEC-BIG5: 2
OSF1.?.multibyte.=.?.EUC-CN: 2
OSF1.?.multibyte.=.?.HP-15CN: 2
! Translations from predefined CCDF-locales to CDE Standard Locales
OSF1.?.ccdf.=.?.HP-ROMAN8: hp-roman8
OSF1.?.ccdf.=.?.ISO-8859-1: ISO8859-1
OSF1.?.ccdf.=.ko_KR.EUC-KR: hp-korean15
OSF1.?.ccdf.=.ko_KR.EUC-KR: eucKR
OSF1.?.ccdf.=.ja_JP.HP-SJIS: hp-japanese15
OSF1.?.ccdf.=.ja_JP.EUC-JP: eucJP
OSF1.?.ccdf.=.?.DT-SYMBOL-1: symbol !!! standard Dt symbol font
! These CDE standard locales may have CCDF-locales, but they are defined by localizers
! OSF1.?.ccdf.=.ar_SA.HP-ARABIC8: arabic8
! OSF1.?.ccdf.=.el_GR.HP-GREEK8: greek8
! OSF1.?.ccdf.=.iw_IL.HP-HEBREW8: hebrew8
! OSF1.?.ccdf.=.tr_TR.HP-TURKISH8: turkish8
! OSF1.?.ccdf.<.ja_JP.HP-SJIS: sjis
! OSF1.?.ccdf.=.ja_JP.HP-KANA8: kana8
! OSF1.?.ccdf.<.ja_JP.EUC-JP: ujis
! OSF1.?.ccdf.=.zh_CN.HP-CCDC: roc15
! Codesets that require multibyte parsing to avoid confusion with shell special chars
OSF1.?.dtkshSpecialParse.=.ja_JP.HP-JIS: True
OSF1.?.dtkshSpecialParse.=.ja_JP.HP-SJIS: True
OSF1.?.dtkshSpecialParse.=.ja_JP.IBM-932: True
OSF1.?.dtkshSpecialParse.=.zh_TW.HP-BIG5: True
OSF1.?.dtkshSpecialParse.=.zh_TW.HP-CCDC: True
OSF1.?.dtkshSpecialParse.=.zh_TW.EUC-TW: True
OSF1.?.dtkshSpecialParse.=.?.DEC-KANJI: True
OSF1.?.dtkshSpecialParse.=.?.DEC-SKANJI: True
OSF1.?.dtkshSpecialParse.=.?.DEC-HANYU: True
OSF1.?.dtkshSpecialParse.=.?.DEC-BIG5: True
!! When content is exchanged with other platforms, the interchange codeset
!! may be different that the codeset used locally. In CDE1, these translations
!! are used by dtmail, but other clients may use the same translations
!! in the future. For example, to improve interoperability of 8-bit mail,
!! the mail messages of users working in codesets such as HP-ROMAN8 or IBM-850
!! are translated to the interchangeCodeset (in this case, ISO-8859-1) before
!! they are sent. Similarly, the mail of Japanese users is translated to JIS
!! before it is sent.
OSF1.?.interchangeCodeset.~.?.ISO-8859-1: ISO-8859-1 ! ISO Latin 1
! OSF1.?.interchangeCodeset.>.?.HP-ROMAN8: ISO-8859-1 ! HP Roman8
! OSF1.?.interchangeCodeset.>.?.IBM-437: ISO-8859-1 ! PC (US)
! OSF1.?.interchangeCodeset.>.?.IBM-850: ISO-8859-1 ! PC (Multi-lingual)
OSF1.?.interchangeCodeset.~.?.ISO-8859-2: ISO-8859-2 ! ISO Latin 2
OSF1.?.interchangeCodeset.~.?.ISO-8859-4: ISO-8859-4 ! ISO Latin 4
OSF1.?.interchangeCodeset.~.?.ISO-8859-5: ISO-8859-5 ! ISO Latin/Cyrillic
OSF1.?.interchangeCodeset.~.?.ISO-8859-6: ISO-8859-6 ! ISO Latin/Arabic
! OSF1.?.interchangeCodeset.>.?.HP-ARABIC8: ISO-8859-6 ! HP Arabic8
! OSF1.?.interchangeCodeset.>.?.IBM-1046: ISO-8859-6 ! PC Arabic Code Set
OSF1.?.interchangeCodeset.~.?.ISO-8859-8: ISO-8859-8 ! ISO Latin/Hebrew
! OSF1.?.interchangeCodeset.>.?.HP-HEBREW8: ISO-8859-8 ! HP Hebrew8
! OSF1.?.interchangeCodeset.>.?.IBM-856: ISO-8859-8 ! PC Hebrew
OSF1.?.interchangeCodeset.~.?.ISO-8859-7: ISO-8859-7 ! ISO Latin/Greek
! OSF1.?.interchangeCodeset.>.?.HP-GREEK8: ISO-8859-7 ! HP Greek8
OSF1.?.interchangeCodeset.~.?.ISO-8859-9: ISO-8859-9 ! ISO Latin 5
! OSF1.?.interchangeCodeset.>.?.HP-TURKISH8: ISO-8859-9 ! HP Turkish8
OSF1.?.interchangeCodeset.~.?.EUC-JP: ISO-2022-JP ! Japanese EUC
! OSF1.?.interchangeCodeset.>.?.HP-SJIS: ISO-2022-JP ! HP Japanese Shift JIS
OSF1.?.interchangeCodeset.>.?.IBM-932: ISO-2022-JP ! PC Japanese Shift JIS
! OSF1.?.interchangeCodeset.>.?.HP-KANA8: ISO-2022-JP ! HP Japanese Katakana8
OSF1.?.interchangeCodeset.~.?.DEC-KANJI: ISO-2022-JP ! Japanese DEC Kanji
OSF1.?.interchangeCodeset.~.?.DEC-SKANJI: ISO-2022-JP ! Japanese Super DEC Kanji
OSF1.?.interchangeCodeset.~.?.EUC-KR: ISO-2022-KR ! Korean EUC
! comment when ISO-2022-CN is supported by iconv
OSF1.?.interchangeCodeset.~.?.EUC-CN: EUC-CN ! China Chinese EUC
! OSF1.?.interchangeCodeset.>.?.HP-15CN: EUC-CN ! HP Chinese EUC
! uncomment when ISO-2022-CN is supported by iconv
! OSF1.?.interchangeCodeset.~.?.EUC-CN: ISO-2022-CN ! China Chinese EUC
! ! OSF1.?.interchangeCodeset.>.?.HP-15CN: ISO-2022-CN ! HP Chinese EUC
! comment when ISO-2022-TW is supported by iconv
OSF1.?.interchangeCodeset.~.?.EUC-TW: EUC-TW ! Taiwan Chinese EUC
OSF1.?.interchangeCodeset.~.?.DEC-HANYU: DEC-HANYU ! Taiwan Chinese DEC Hanyu
OSF1.?.interchangeCodeset.~.?.DEC-BIG5: DEC-BIG5 ! Taiwan Chinese DEC Big5
! OSF1.?.interchangeCodeset.>.?.HP-BIG5: EUC-TW ! HP Big5 Chinese
! OSF1.?.interchangeCodeset.>.?.HP-CCDC: EUC-TW ! HP CCDC Chinese
! uncomment when ISO-2022-TW is supported by iconv
! OSF1.?.interchangeCodeset.~.?.EUC-TW: ISO-2022-TW ! Taiwan Chinese EUC
! ! OSF1.?.interchangeCodeset.>.?.HP-BIG5: ISO-2022-TW ! HP Big5 Chinese
! ! OSF1.?.interchangeCodeset.>.?.HP-CCDC: ISO-2022-TW ! HP CCDC Chinese
OSF1.?.interchangeCodeset.~.?.TIS-620: TIS-620 ! Thai
OSF1.?.interchangeCodeset.>.?.UCS-2: UTF-8 ! Unicode
OSF1.?.interchangeCodeset.~.?.UTF-8: UTF-8 ! multibyte Unicode
!! Codeset identifiers for use with MIME messages. The .~. translations
!! are used by dtmail and adhere to the MIME standard, RFC 1521.
!! Note that the MIME standard states that codeset identifiers are
!! case-insensitive. The operation-specific values on the right-hand-side
!! of the translations below, however, ARE case sensitive. Before
!! doing a OpToStd translation, first convert the MIME codeset identifier
!! to uppercase. Alternatively, one could provide lower-case versions
!! of the translations (right-hand-side only should be in lower-case).
OSF1.?.mime.~.?.ISO-8859-1: ISO-8859-1 ! ISO Latin 1
OSF1.?.mime.~.?.HP-ROMAN8: X-HP-ROMAN8 ! HP Roman8
OSF1.?.mime.~.?.IBM-437: X-IBM-437 ! PC (US)
OSF1.?.mime.~.?.IBM-850: X-IBM-850 ! PC (Multi-lingual)
OSF1.?.mime.~.?.ISO-8859-2: ISO-8859-2 ! ISO Latin 2
OSF1.?.mime.~.?.ISO-8859-4: ISO-8859-4 ! ISO Latin 4
OSF1.?.mime.~.?.ISO-8859-5: ISO-8859-5 ! ISO Latin/Cyrillic
OSF1.?.mime.~.?.ISO-8859-6: ISO-8859-6 ! ISO Latin/Arabic
OSF1.?.mime.~.?.HP-ARABIC8: X-HP-ARABIC8 ! HP Arabic8
OSF1.?.mime.~.?.IBM-1046: X-IBM-1046 ! PC Arabic Code Set
OSF1.?.mime.~.?.ISO-8859-8: ISO-8859-8 ! ISO Latin/Hebrew
OSF1.?.mime.~.?.HP-HEBREW8: X-HP-HEBREW8 ! HP Hebrew8
OSF1.?.mime.~.?.IBM-856: X-IBM-856 ! PC Hebrew
OSF1.?.mime.~.?.ISO-8859-7: ISO-8859-7 ! ISO Latin/Greek
OSF1.?.mime.~.?.HP-GREEK8: X-HP-GREEK8 ! HP Greek8
OSF1.?.mime.~.?.ISO-8859-9: ISO-8859-9 ! ISO Latin 5
OSF1.?.mime.~.?.HP-TURKISH8: X-HP-TURKISH8 ! HP Turkish8
OSF1.?.mime.~.?.EUC-JP: X-EUC-JP ! Japanese EUC
OSF1.?.mime.~.?.ISO-2022-JP: ISO-2022-JP ! Japanese JIS with 7-bit encoding per ISO-2022-JP
OSF1.?.mime.~.?.HP-SJIS: X-HP-SJIS ! HP Japanese Shift JIS
OSF1.?.mime.~.?.IBM-932: X-IBM-932 ! PC Japanese Shift JIS
OSF1.?.mime.~.?.HP-KANA8: X-HP-KANA8 ! HP Japanese Katakana8
OSF1.?.mime.~.?.EUC-KR: X-EUC-KR ! Korean EUC
OSF1.?.mime.~.?.ISO-2022-KR: ISO-2022-KR ! Korean with 7-bit encoding per ISO-2022-KR
OSF1.?.mime.~.?.EUC-CN: X-EUC-CN ! China Chinese EUC
OSF1.?.mime.~.?.ISO-2022-CN: ISO-2022-CN ! China Chinese with 7-bit encoding per ISO-2022-CN
OSF1.?.mime.~.?.HP-15CN: X-HP-15CN ! HP China Chinese EUC
OSF1.?.mime.~.?.EUC-TW: X-EUC-TW ! Taiwan Chinese EUC
OSF1.?.mime.~.?.ISO-2022-TW: ISO-2022-TW ! Taiwan Chinese with 7-bit encoding per ISO-2022-TW
OSF1.?.mime.~.?.DEC-HANYU: X-DEC-HANYU ! Taiwan Chinese DEC Hanyu
OSF1.?.mime.~.?.DEC-BIG5: X-DEC-BIG5 ! Taiwan Chinese DEC Big5
OSF1.?.mime.~.?.HP-BIG5: X-HP-BIG5 ! HP Big5 Taiwan Chinese
OSF1.?.mime.~.?.HP-CCDC: X-HP-CCDC ! HP CCDC Taiwan Chinese
OSF1.?.mime.~.?.TIS-620: X-TIS-620 ! Thai
OSF1.?.mime.~.?.UCS-2: X-UCS-2 ! Unicode; group 0, plane 0 of ISO-10646
OSF1.?.mime.~.?.UCS-4: X-UCS-4 ! ISO-10646
OSF1.?.mime.~.?.UTF-7: X-UTF-7 ! multibyte encoding of Unicode
OSF1.?.mime.~.?.UTF-8: X-UTF-8 ! multibyte encoding of Unicode
OSF1.?.mime.~.?.UTF-16: X-UTF-16 ! multibyte encoding of Unicode
!! If other mailers are using other codeset identifiers in their MIME
!! messages, dtmail will not be able to process them correctly.
!! To correct this, additional .<. translations for these identifiers
!! can be added to a <platform>.lcx file in the /etc/dt/config/svc
!! or $HOME/.dt/config/svc directories. Such translations should read:
!! <platform>.?.mime.<.?.<CDE std codeset>: <mailer identifier for the codeset>
!!
!! ***NEVER*** use a .~. translation, such as we use above, as this could
!! cause dtmail to send unexpected identifier strings by overriding the
!! above definition. Further, never use .=. or .>. translations.
!!
!! These two identifiers are in common usage, as they derive from RFC1521.
OSF1.?.mime.<.?.ISO-8859-1: us-ascii ! ISO Latin 1
OSF1.?.mime.<.?.ISO-8859-1: US-ASCII ! ISO Latin 1

4
cde/lib/DtSvc/DtEncap/Symbolic.c
View File

@@ -32,10 +32,6 @@
* (c) Copyright 1993, 1994 Novell, Inc. *
*/
#ifdef __osf__
#define SBSTDINC_H_NO_REDEFINE
#endif
#include <Dt/UserMsg.h>
#include <bms/sbport.h> /* NOTE: sbport.h must be the first include. */

5
cde/lib/DtSvc/DtEncap/bmsglob.c
View File

@@ -32,11 +32,6 @@
* (c) Copyright 1993, 1994 Novell, Inc. *
*/
#ifdef __osf__
/* #define SBSTDINC_H_NO_INCLUDE */
#define SBSTDINC_H_NO_REDEFINE
#endif
#include <bms/sbport.h>
#include <bms/bms.h>

8
cde/lib/DtSvc/DtEncap/local.c
View File

@@ -35,12 +35,8 @@
#define __need_timeval /* Needed for "struct timeval" from <time.h>. */
#define __need_fd_set
#include <bms/sbport.h>
#ifdef __osf__
#include <sys/time.h> /* For declaration of select(). */
#else
#include <bms/sbport.h>
#include <time.h>
#endif
#include <errno.h>
#include <signal.h>
@@ -206,7 +202,7 @@ void local_channel_object_input_handler(void * client_data,
timeout.tv_sec = 0;
timeout.tv_usec = 0;
#if defined(SVR4) || defined(__osf__) || defined(__hpux) || defined(__OpenBSD__) || defined(linux)
#if defined(SVR4) || defined(__hpux) || defined(__OpenBSD__) || defined(linux)
select(max_fds, (fd_set*)&read_fd_vect, NULL, (fd_set*)&except_fd_vect, &timeout);
#else
/* UX has select defined with int*, not fd_set* parms */

2
cde/lib/DtSvc/DtUtil1/CmdMain.c
View File

@@ -998,7 +998,7 @@ _DtCmdCommandInvokerExecute (
if (commandPid == 0)
{
#if defined(__hp_osf) || defined(__osf__) || defined(CSRG_BASED)
#if defined(CSRG_BASED)
setsid() ;
#else
(void) setpgrp ();

4
cde/lib/DtSvc/DtUtil1/CmdProcess.c
View File

@@ -45,13 +45,9 @@
#include <limits.h>
#endif
#if defined(__hp_osf) || defined (__osf__)
#include <sys/access.h>
#else
#if defined(__hpux)
#include <sys/getaccess.h>
#endif
#endif
#include <sys/socket.h>
#include <netdb.h>

6
cde/lib/DtSvc/DtUtil1/DtsMM.h
View File

@@ -47,11 +47,7 @@
* file, and therefore affects the Xsession.src, Xreset.src, and
* Xstartup.src scripts in dtlogin/config.
*/
#ifdef __osf__
# define _DTDTSMMTEMPDIR "/var/tmp"
#else
# define _DTDTSMMTEMPDIR "/tmp"
#endif
#define _DTDTSMMTEMPDIR "/tmp"
typedef int DtDtsMMSeqNo; /* the order it occures in db */
typedef int DtDtsMMFieldCount; /* number of fields in record */

2
cde/lib/DtSvc/DtUtil2/XlationSvc.c
View File

@@ -2199,7 +2199,7 @@ int _DtXlateGetXlateEnv(
/* then look up version number of execution host */
if (ret_AppExecEnvVersion)
{
#if defined(sun) || defined(_AIX) || defined(__osf__) || defined(linux) || defined(CSRG_BASED)
#if defined(sun) || defined(_AIX) || defined(linux) || defined(CSRG_BASED)
char version[SYS_NMLN+SYS_NMLN+2];
#else
char version[UTSLEN+UTSLEN+2];

38
cde/lib/DtSvc/include/bms/sbport.h
View File

@@ -110,22 +110,6 @@
# define OSF_BUG
#endif
#if defined(__osf__) && !defined(__osf)
# define __osf
# define __sysv
# define OSF_BUG
# define __char_ptr_yytext
#endif
#if defined(osf) && !defined(__osf)
# define __osf
# define __sysv
# define __osfs700
# define OSF_BUG
# define __hp_color_object
# define __char_ptr_yytext
#endif
#ifdef __hpux
# define __sysv
/* __hp9000s300 or __hp9000s800 is defined by HP-UX cpp */
@@ -223,10 +207,6 @@
/* ----------------------------------------------------------------- */
#if defined(__need_timeval) /* Get "struct timeval" */
# ifdef __osf
# define _OSF_SOURCE
# include <sys/time.h>
# endif
# ifdef __sun
# include <sys/time.h>
# endif
@@ -240,10 +220,6 @@
#if defined(__need_fd_set) /* Get "typedef struct fd_set" */
# ifdef __osf
# define _OSF_SOURCE
# include <sys/types.h>
# endif
# ifdef __apollo
# define _INCLUDE_BSD_SOURCE
# include "/bsd4.3/usr/include/sys/types.h"
@@ -255,9 +231,6 @@
#if defined(__need_S_IF) /* Get S_IFNWK, S_IFLNK */
# ifdef __osf
# define _OSF_SOURCE
# endif
# ifdef __apollo
# define _APOLLO_SOURCE
# endif
@@ -271,9 +244,6 @@
#endif
#if defined(__need_all_signals) /* Get all SIGxxx values */
# ifdef __osf
# define _OSF_SOURCE
# endif
# ifdef __apollo
# define _APOLLO_SOURCE
# include "/bsd4.3/usr/include/sys/types.h"
@@ -285,7 +255,7 @@
/* about above. So, declare them only if we don't already have them */
/* ----------------------------------------------------------------- */
#if defined(_HPUX_SOURCE) || defined(__sun) || defined(_INCLUDE_BSD_SOURCE) || defined(_OSF_SOURCE) || defined(__aix) || defined(__osf__) || defined(linux)
#if defined(_HPUX_SOURCE) || defined(__sun) || defined(_INCLUDE_BSD_SOURCE) || defined(__aix) || defined(linux)
/* the "u_types" are defined in standard files */
# undef _INCLUDE_BSD_SOURCE
#else
@@ -298,15 +268,11 @@
/* Use these if you must ensure that you get a specific number of bits */
/* -------------------------------------------------------------------- */
typedef char int8;
typedef short int16;
#ifndef __osf__
typedef short int16;
typedef long int32;
#endif
typedef unsigned char u_int8;
typedef unsigned short u_int16;
#ifndef __osf__
typedef unsigned long u_int32;
#endif
#define __xechar_is_signed
#undef __xechar_is_unsigned

12
cde/lib/DtSvc/include/bms/sbstdinc.h
View File

@@ -62,7 +62,7 @@
#if !(defined(apollo) && defined(__bsd)) && !defined(CSRG_BASED)
#if defined(__STDC__)
#if !defined(linux) && !defined(__osf__) && !defined(_XFUNCS_H_) && !defined(sun)
#if !defined(linux) && !defined(_XFUNCS_H_) && !defined(sun)
extern void bcopy(char *b1, char *b2, int length);
extern int bcmp(char *b1, char *b2, int length);
extern void bzero(char *b, int length);
@@ -70,7 +70,7 @@ extern void bzero(char *b, int length);
extern char *mktemp(char *tmplate);
#elif ! defined(__cplusplus)
#if !defined(linux) && !defined(__osf__) && !defined(_XFUNCS_H_)
#if !defined(linux) && !defined(_XFUNCS_H_)
extern void bcopy();
extern int bcmp();
extern void bzero();
@@ -224,12 +224,10 @@ extern size_t Xestrlen(ConstXeString s);
#else
extern size_t Xestrlen();
#endif
#ifndef __osf__
# ifdef strlen
# undef strlen
# endif
# define strlen Xestrlen
#ifdef strlen
# undef strlen
#endif
#define strlen Xestrlen
#if defined(__STDC__) || defined(__cplusplus)
extern XeString Xestrdup(ConstXeString s);

2
cde/lib/DtSvc/include/codelibs/dynarray.h
View File

@@ -39,7 +39,7 @@
#if !defined(linux) && !defined(CSRG_BASED) && !defined(sun)
#include <generic.h>
#endif
#if defined(__osf__) || defined(sun) || defined(linux) || defined(CSRG_BASED)
#if defined(sun) || defined(linux) || defined(CSRG_BASED)
#define _DELETE_ARRAY(sz) delete[]
#else
#define _DELETE_ARRAY(sz) delete[(sz)]

6
cde/lib/DtSvc/include/codelibs/privbuf.h
View File

@@ -48,9 +48,9 @@ typedef void (*privbuf_func)(void *v);
#include <stddef.h>
#include <stdlib.h>
#if defined(__osf__) || defined(sun) || defined(linux) || defined(CSRG_BASED)
// The DEC C++ compiler rejects valid inline declarations, claiming
// they have both internal and external linkage.
#if defined(sun) || defined(linux) || defined(CSRG_BASED)
// Rejects valid inline declarations, claiming they have both internal and
// external linkage.
#else
inline static void *operator new(size_t size) { return malloc((unsigned)size); }
inline static void operator delete(void *p) { if (p) free((char*)p); }

14
cde/lib/DtSvc/include/codelibs/stringx.h
View File

@@ -54,9 +54,7 @@ extern "C"
{
#endif
#if defined(__cplusplus) || defined(__STDC__)
#if !defined(__osf__) && !defined(sun)
/* The DEC C++ compiler rejects this, claiming it has both */
/* internal and external linkage. */
#if !defined(sun)
char *strnew(size_t len);
void strfree(const char *s);
#endif
@@ -75,12 +73,10 @@ extern "C"
#ifdef __cplusplus
char *strtokx(char *&ptr, const char *sep);
# if !defined(__osf__) && !defined(linux) && !defined(sun) && !defined(CSRG_BASED)
# if !defined(linux) && !defined(sun) && !defined(CSRG_BASED)
char **strsep(const char *str, const char *sep,
boolean whsp = TRUE, int *num = NULL);
# if !defined(__osf__)
const char *strcmbn(const char **vec, const char *sep = " ");
# endif
# endif
#else /* __STDC__ */
@@ -89,9 +85,7 @@ extern "C"
char **strsep(const char *str, const char *sep,
boolean whsp, int *num);
#endif
#ifndef __osf__
const char *strcmbn(const char **vec, const char *sep);
#endif
#endif /* __STDC__ */
@@ -125,7 +119,7 @@ extern size_t nl_strlen(); /* __OBSOLETE */
#if defined(__cplusplus)
}
#if defined(apollo) || defined(__aix) || defined(__osf__) || defined(linux) || defined(CSRG_BASED)
#if defined(apollo) || defined(__aix) || defined(linux) || defined(CSRG_BASED)
#include <stdlib.h>
#else
#include <malloc.h>
@@ -137,7 +131,7 @@ inline void strfree(const char *s)
{ if (s != NULL) free((char *)s); }
#else
inline void strfree(const char *s)
#if defined(__hpux) || defined(__osf__) || defined(CSRG_BASED)
#if defined(__hpux) || defined(CSRG_BASED)
{ if (s != NULL) free((void *)s); }
#else
{ if (s != NULL) free((void *)s); }

5
cde/lib/DtTerm/Term/TermSendEsc.h
View File

@@ -70,12 +70,7 @@
#define F8_VT "\033[19~"
#define F9_VT "\033[20~"
#define F10_VT "\033[21~"
#ifdef __osf__
/* Temporary work around */
#define F11_VT "\033"
#else
#define F11_VT "\033[23~"
#endif /* __osf__ */
#define F12_VT "\033[24~"
#define F13_VT "\033[25~"
#define F14_VT "\033[26~"

5
cde/lib/DtTerm/TermPrim/TermPrimPendingText.c
View File

@@ -39,11 +39,6 @@ static char rcs_id[] = "$TOG: TermPrimPendingText.c /main/3 1997/07/03 15:40:05
#include "TermPrimDebug.h"
#include "TermPrimPendingTextP.h"
#ifdef __osf__
#include <termios.h>
#include <poll.h>
#endif /* __osf__ */
static
PendingTextChunk
mallocChunk(int len);

11
cde/lib/DtTerm/TermPrim/TermPrimSetUtmp.c
View File

@@ -85,11 +85,6 @@ static char rcs_id[] = "$TOG: TermPrimSetUtmp.c /main/10 1998/04/03 17:11:42 mgr
#define UT_NO_pututline
#endif /* __AIX */
#ifdef __osf__
#define UT_HOST ut_host
#define UT_NO_pututline
#endif /* __osf__ */
/* /etc/utmp include files... */
#ifdef UT_UTMPX
@@ -386,10 +381,10 @@ UtmpEntryCreate(Widget w, pid_t pid, char *utmpLine)
}
(void) strncpy(utPtr->ut_id, c, sizeof(utPtr->ut_id));
#else /* __hpux */
#if defined(__AIX) || defined(__osf__)
#if defined(__AIX)
(void) strncpy(utPtr->ut_id, utmpLine,
sizeof(utPtr->ut_id));
#else /* __AIX || __osf__ */
#else /* __AIX */
#if defined(linux) || defined(sun)
if (c = strchr(utmpLine, '/')) {
c++;
@@ -400,7 +395,7 @@ UtmpEntryCreate(Widget w, pid_t pid, char *utmpLine)
#else /* linux || sun */
error out -- missing code for utPtr->ut_id
#endif /* sun */
#endif /* __AIX || __osf__ */
#endif /* __AIX */
#endif /* __hpux */
}

10
cde/lib/DtWidget/Editor.c
View File

@@ -53,7 +53,7 @@
#include <ctype.h>
#include <stdlib.h>
#if defined(__hpux) || defined(__osf__)
#if defined(__hpux)
# include <wchar.h>
#elif defined(sun)
# if (_XOPEN_VERSION==3)
@@ -771,14 +771,12 @@ static XtActionsRec EditorActionTable[] = {
# define iswblank(wc) iswctype((wc),blnkclass)
# undef getwc /* Use the libc function */
#endif
#if defined(__osf__) || defined(_AIX) /* __osf__ || _AIX */
/* function prototype for wctype() was changed to meet spec1170 */
/* digital compiler flagged warning */
#if defined(_AIX) /* _AIX */
/* IBM defines wctype to get_wctype above - don't use const. */
static char *blankString = "space";
#else /* __osf__ || _AIX */
#else /* _AIX */
static const char *blankString = "space";
#endif /* __osf__ || _AIX */
#endif /* _AIX */
static wctype_t _DtEditor_blankClass;
#else
# define wctype_t int

5
cde/lib/csa/cmxdr.c
View File

@@ -44,13 +44,8 @@
bool_t
xdr_time_t(register XDR *xdrs, time_t *objp)
{
#ifdef __osf__
if (!xdr_int(xdrs, objp))
return (FALSE);
#else
if (!xdr_long(xdrs, objp))
return (FALSE);
#endif
return (TRUE);
}

31
cde/lib/csa/connection.c
View File

@@ -80,17 +80,10 @@ static void delete_client_info(_DtCm_Client_Info *oldci);
static void cleanup_some_connection(_DtCm_Client_Info *dontclose);
static void check_registration(_DtCm_Connection *conn);
static _DtCm_Client_Info * get_new_client_handle(_DtCm_Connection *conn);
#ifdef __osf__
static CSA_return_code get_client_handle(const char *host, const u_int prognum,
u_long *vers_outp, const u_long vers_low,
const u_long vers_high, char *nettype,
CLIENT **clnt);
#else
static CSA_return_code get_client_handle(const char *host, const u_long prognum,
u_long *vers_outp, const u_long vers_low,
const u_long vers_high, char *nettype,
CLIENT **clnt);
#endif
static CSA_return_code regstat4_to_dtcmstatus(Registration_Status_4 stat4);
extern CSA_return_code
@@ -824,11 +817,7 @@ get_new_client_handle(_DtCm_Connection *conn)
static CSA_return_code
get_client_handle(
const char *host,
#ifdef __osf__
const u_int prognum,
#else
const u_long prognum,
#endif
u_long *vers_outp,
const u_long vers_low,
const u_long vers_high,
@@ -854,23 +843,12 @@ get_client_handle(
}
#endif
#ifdef __osf__
/*
* A longer timeout value may be necessay - for example if
* the system is bogged down and/or rpc.cmsd is not running.
*
* The value below is the same value used when a ToolTalk app connects
* to the ToolTalk database server (lib/tt/lib/db/tt_db_client.C).
*/
tv.tv_sec = 4;
#else
tv.tv_sec = 1;
#endif
tv.tv_usec = 0;
*clnt = NULL;
for (vers = vers_high; vers >= vers_low; vers--) {
#if defined(__osf__) || defined(__hpux)
#if defined(__hpux)
if ((cl = clnt_create((char *)host, prognum, vers, nettype)) != NULL) {
#else
@@ -884,13 +862,6 @@ get_client_handle(
if (status == RPC_SUCCESS) {
*vers_outp = vers;
*clnt = cl;
#ifdef __osf__
/*
* Set the timeout back to the original.
*/
tv.tv_sec = 1;
clnt_control(cl, CLSET_TIMEOUT, (char *)&tv);
#endif
return (CSA_SUCCESS);
} else if (status != RPC_PROGVERSMISMATCH) {
return (_DtCm_clntstat_to_csastat(status));

8
cde/lib/csa/iso8601.c
View File

@@ -136,11 +136,7 @@ _csa_iso8601_to_tick(char *buf, time_t *tick_out)
orig_tzset = B_TRUE;
}
#ifdef __osf__
set_timezone("GMT0");
#else
set_timezone("GMT");
#endif
*tick_out = mktime(&time_str);
@@ -186,11 +182,7 @@ _csa_tick_to_iso8601(time_t tick, char *buf_out)
orig_tzset = B_TRUE;
}
#ifdef __osf__
set_timezone("GMT0");
#else
set_timezone("GMT");
#endif
time_str = localtime(&tk);

2
cde/lib/tt/bin/shell/mover.C
View File

@@ -35,7 +35,7 @@
#include "tt_options.h"
#include <errno.h>
#include <string.h>
#if defined(__osf__) || defined(linux) || defined(CSRG_BASED)
#if defined(linux) || defined(CSRG_BASED)
#include <unistd.h>
#else
#if !defined(sun)

4
cde/lib/tt/bin/shell/rcopier.C
View File

@@ -34,11 +34,7 @@
#include "tt_options.h"
#include <string.h>
#ifdef __osf__
#include <unistd.h>
#else
#include <osfcn.h>
#endif
#if defined(OPT_BUG_SUNOS_4)
# include <stdlib.h>
#endif

2
cde/lib/tt/bin/shell/remover.C
View File

@@ -35,7 +35,7 @@
#include "tt_options.h"
#include <errno.h>
#include <string.h>
#if defined(__osf__) || defined(linux) || defined(CSRG_BASED)
#if defined(linux) || defined(CSRG_BASED)
#include <unistd.h>
#else
#if !defined(sun)

6
cde/lib/tt/bin/ttdbserverd/db_server_svc.C
View File

@@ -214,7 +214,7 @@ main(int argc, char** argv, char **envp)
void install_signal_handler();
SVCXPRT *transp;
struct sockaddr_in saddr;
#if defined(DEC) || defined(HPUX)
#if defined(HPUX)
int asize = sizeof(saddr);
#else
# if defined(linux) || defined(CSRG_BASED) || defined(sun)
@@ -484,11 +484,11 @@ main(int argc, char** argv, char **envp)
if (!_tt_debug_mode) {
if (0!=fork()) exit(0);
#if defined(__osf__) || defined(CSRG_BASED)
#if defined(CSRG_BASED)
setsid();
#else
setpgrp();
#endif // __osf__
#endif //CSRG_BASED
close(0); close(1); close(2);

2
cde/lib/tt/bin/tttar/tttar.C
View File

@@ -37,7 +37,7 @@
#include <stdlib.h>
#include <sys/param.h>
#include <sys/stat.h>
#if defined(__osf__) || defined(linux) || defined(sun) || defined(CSRG_BASED)
#if defined(linux) || defined(sun) || defined(CSRG_BASED)
#include <unistd.h>
#else
#if !defined(sun)

2
cde/lib/tt/bin/tttar/tttar_api.C
View File

@@ -33,7 +33,7 @@
*/
#include <errno.h>
#if defined(__osf__) || defined(linux) || defined(CSRG_BASED) || defined(sun)
#if defined(linux) || defined(CSRG_BASED) || defined(sun)
#include <unistd.h>
#else
#include <osfcn.h>

4
cde/lib/tt/bin/tttar/tttar_spec.C
View File

@@ -32,11 +32,11 @@
*
*/
#if defined(__osf__) || defined(linux) || defined(CSRG_BASED) || defined(sun)
#if defined(linux) || defined(CSRG_BASED) || defined(sun)
#include <unistd.h>
#else
#include <osfcn.h>
#endif /* __osf__ */
#endif
#include "api/c/tt_c.h"
#include "util/tt_iostream.h"
#include "tttar_utils.h"

13
cde/lib/tt/lib/api/c/api_filemap.C
View File

@@ -242,19 +242,6 @@ printf("DEBUG _tt_host_netfile_file: resolving locally.\n");
return _tt_netfile_file(netfilename);
}
#ifdef __osf__
// hostname and localhost were not the same, so make one more check
// of the environment variable created by /usr/dt/bin/Xsession. If
// we have started the system without a network configured, this will
// be true during an initial system installation.
if (getenv("DTNONETWORK")) {
// strdup already done in _tt_netfile_file()
return _tt_file_netfile(netfilename);
}
#endif /* __osf__ */
_Tt_string path(netfilename);
_Tt_string file;

24
cde/lib/tt/lib/db/db_server_xdr.C
View File

@@ -380,17 +380,6 @@ xdr_Tt_oidaccess_args(XDR *xdrs, _Tt_oidaccess_args *objp)
bool_t
xdr_Tt_oidaccess_results(XDR *xdrs, _Tt_oidaccess_results *objp)
{
#ifdef __osf__
if (!xdr_u_int(xdrs, (u_int *)&objp->uid)) {
return (FALSE);
}
if (!xdr_u_int(xdrs, (u_int *)&objp->group)) {
return (FALSE);
}
if (!xdr_u_int(xdrs, (u_int *)&objp->mode)) {
return (FALSE);
}
#else
if (!xdr_long(xdrs, (long *)&objp->uid)) {
return (FALSE);
}
@@ -400,7 +389,6 @@ xdr_Tt_oidaccess_results(XDR *xdrs, _Tt_oidaccess_results *objp)
if (!xdr_short(xdrs, (short *)&objp->mode)) {
return (FALSE);
}
#endif
if (!xdr_int(xdrs, &objp->result)) {
return (FALSE);
}
@@ -515,25 +503,13 @@ xdr_tt_property(XDR *xdrs, _tt_property *objp)
bool_t
xdr_tt_access(XDR *xdrs, _tt_access *objp)
{
#ifdef __osf__
if (!xdr_u_int(xdrs, (u_int *)&objp->user)) {
#else
if (!xdr_long(xdrs, (long *)&objp->user)) {
#endif /* __osf__ */
return (FALSE);
}
#ifdef __osf__
if (!xdr_u_int(xdrs, (u_int *)&objp->group)) {
#else
if (!xdr_long(xdrs, (long *)&objp->group)) {
#endif /* __osf__ */
return (FALSE);
}
#ifdef __osf__
if (!xdr_u_int(xdrs, (u_int *)&objp->mode)) {
#else
if (!xdr_u_long(xdrs, (unsigned long *)&objp->mode)) {
#endif /* __osf__ */
return (FALSE);
}
return (TRUE);

2
cde/lib/tt/lib/db/tt_db_file.h
View File

@@ -40,7 +40,7 @@
#include "db/tt_db_hostname_global_map_ref.h"
#include "db/tt_db_access_utils.h"
#include "db/tt_db_property_utils.h"
#if defined(OPT_BUG_HPUX) || defined(OPT_BUG_AIX) || defined(__osf__)
#if defined(OPT_BUG_HPUX) || defined(OPT_BUG_AIX)
# undef copy
#endif

7
cde/lib/tt/lib/db/tt_db_key.h
View File

@@ -46,16 +46,9 @@
struct _Tt_key_data {
unsigned short version;
unsigned short padding;
#ifdef __osf__
/* These fields need to be: <host id:4> <time sec:4> <counter:4> */
unsigned int hostid;
unsigned int time_sec;
unsigned int counter;
#else
unsigned long hostid;
unsigned long time_sec;
unsigned long counter;
#endif /* __osf__ */
};
const int TT_DB_KEY_LENGTH = sizeof(_Tt_key_data);

6
cde/lib/tt/lib/libtt.elist
View File

@@ -667,11 +667,7 @@ privateC++ _Tt_trace::operator<<(int) const
privateC++ _Tt_trace::print(void (*)(const _Tt_ostream&,const _Tt_object*),const _Tt_object*) const
privateC++ _Tt_xdr_size_stream::_Tt_xdr_size_stream(void)
privateC++ _Tt_xdr_size_stream::operator XDR*(void)
#ifdef __osf__
privateC++ _tt_base64_encode(unsigned int)
#else /* __osf__ */
privateC++ _tt_base64_encode(unsigned long)
#endif /* __osf__ */
privateC++ _tt_catgets(int,int,const char*)
privateC++ _tt_db_create_objid(const _Tt_db_key_ptr&,const _Tt_string&,const _Tt_string&,const _Tt_string&)
privateC++ _tt_dir_entries(const _Tt_string&,int)
@@ -2561,7 +2557,7 @@ internal __page_size_K
internal _mutex_global_np
#endif
#if defined(_AIX) || defined(__osf__)
#if defined(_AIX)
/* Symbols from realpath.c */
internal _tt_internal_realpath
#endif

2
cde/lib/tt/lib/mp/mp_session.C
View File

@@ -149,7 +149,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(ultrix) || defined(_AIX) || defined(hpux)
int servlen = strlen(server_addr.sun_path) + sizeof(server_addr.sun_fam\
ily);
if (connect(sock, (sockaddr *)&server_addr, servlen) < 0) {

28
cde/lib/tt/lib/tt_options.h
View File

@@ -408,34 +408,6 @@
# undef OPT_TAR_HAS_EXCLUDE_OPTION
# define OPT_BUG_RPCINTR
#elif defined(__osf__)
# 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
# undef OPT_BSD_SIGNAL
# define OPT_POSIX_SIGNAL
# undef OPT_BSD_WAIT
# undef OPT_PATCH
# undef OPT_I18N
# define OPT_CATGETS
# undef OPT_GETDTABLESIZE
# undef OPT_SYSINFO
# define OPT_CPP_PATH "/usr/ccs/lib/cpp"
# define OPT_CPP_OPTIONS ""
# define OPT_STRERROR
# undef OPT_SVR4_GETMNTENT
# define OPT_LOCAL_MOUNT_TYPE MNTTYPE_UFS
# define OPT_DEFINE_SIG_PF
# undef OPT_TAR_HAS_EXCLUDE_OPTION
# undef OPT_HAS_REALPATH
# if defined(OSMAJORVERSION) && (OSMAJORVERSION >= 4)
# define OPT_XDR_LONG_TYPE int
# endif
#elif defined(linux)
# undef OPT_UNIX_SOCKET_RPC

28
cde/lib/tt/lib/util/tt_base64.C
View File

@@ -75,19 +75,6 @@ static const char base64_values[256] = {
64, 64, 64, 64, 64, 64, 64, 64,
64, 64, 64, 64, 64, 64, 64, 64};
#ifdef __osf__
/*
* _tt_base64_encode(i) -- convert number to base-64 character string
*
* Purpose: Convert an int value (typically a time) to a "base-64"
* representation. Return a _Tt_string containing
* the representation, not including any leading zeroes.
*/
_Tt_string
_tt_base64_encode(unsigned int i)
{
int maxlen = (sizeof(int)*8+5)/6;
#else /* __osf__ */
/*
* _tt_base64_encode(i) -- convert number to base-64 character string
*
@@ -99,7 +86,6 @@ _Tt_string
_tt_base64_encode(unsigned long i)
{
int maxlen = (sizeof(long)*8+5)/6;
#endif /* __osf__ */
_Tt_string retval(maxlen);
int c = maxlen-1;
@@ -116,19 +102,6 @@ _tt_base64_encode(unsigned long i)
return retval;
}
#ifdef __osf__
/*
* _tt_base64_decode(i) -- convert base-64 character string to number
*
* Purpose: Convert a string in a "base-64"
* representation to an unsigned int.
*/
unsigned int
_tt_base64_decode(const char *s)
{
int c,v;
unsigned int r;
#else /* __osf__ */
/*
* _tt_base64_decode(i) -- convert base-64 character string to number
*
@@ -140,7 +113,6 @@ _tt_base64_decode(const char *s)
{
int c,v;
unsigned long r;
#endif /* __osf__ */
r = 0;
while (c = *s++) {

5
cde/lib/tt/lib/util/tt_base64.h
View File

@@ -40,13 +40,8 @@
#include "util/tt_string.h"
#ifdef __osf__
unsigned int _tt_base64_decode(const char *s);
_Tt_string _tt_base64_encode(unsigned int n);
#else /* __osf__ */
unsigned long _tt_base64_decode(const char *s);
_Tt_string _tt_base64_encode(unsigned long n);
#endif /* __osf__ */
#endif /* _TT_BASE64_H */

2
cde/lib/tt/lib/util/tt_entry_pt.C
View File

@@ -449,7 +449,7 @@ _Tt_string _tt_entrypt_to_string(_Tt_entry_pt fun)
return "tt_feature_enabled";
case TT_FEATURE_REQUIRED :
return "tt_feature_required";
#if defined(__osf__) || defined(linux)
#if defined(linux)
case TT_API_CALL_LAST: return (char *) NULL;
#elif defined(OPT_CONST_CORRECT)
case TT_API_CALL_LAST: return (const char *) NULL;

18
cde/lib/tt/lib/util/tt_file_system.C
View File

@@ -83,15 +83,13 @@
# define ttFsName(e) vmt2dataptr(e,VMT_OBJECT)
# define ttMountPt(e) vmt2dataptr(e,VMT_STUB)
# define ttCloseMntTbl(f) free(tmpbuf)
#elif defined(__osf__) || defined(CSRG_BASED)
#elif defined(CSRG_BASED)
# include <sys/types.h>
# include <sys/mount.h>
#if defined(HAS_STATVFS)
extern "C" int getfsstat(struct statvfs *, long, int);
#elif defined(__osf__)
extern "C" int getfsstat(struct statfs *, long, int);
# endif
# define MNTTYPE_NFS "nfs"
@@ -104,15 +102,7 @@
# define TtMntEntry struct statfs *
# endif
# ifdef __osf__
# define ttFsType(e) \
(((e)->f_type == MOUNT_UFS) ? "ufs" \
: (((e)->f_type == MOUNT_NFS3) ? "nfs" \
: (((e)->f_type == MOUNT_NFS) ? "nfs" \
: (((e)->f_type == MOUNT_CDFS) ? "cdfs" \
: (((e)->f_type == MOUNT_PROCFS) ? "procfs" \
: "unknown")))))
# elif defined(CSRG_BASED)
# if defined(CSRG_BASED)
# define ttFsType(e) (e->f_fstypename)
# endif
# define ttFsName(e) ((char *)((e)->f_mntfromname))
@@ -510,7 +500,7 @@ updateFileSystemEntries ()
}
entry = &buf[i];
#elif defined(__osf__) || defined(CSRG_BASED)
#elif defined(CSRG_BASED)
int numfs,i;
struct statfs *buf;
long bufsize;
@@ -549,7 +539,7 @@ updateFileSystemEntries ()
#else
while (entry = getmntent(mount_table))
#endif
#if !defined(__osf__) && !defined(CSRG_BASED)
#if !defined(CSRG_BASED)
{
#endif
fse = createFileSystemEntry( entry );

10
cde/lib/tt/lib/util/tt_host.C
View File

@@ -45,13 +45,9 @@ extern "C" in_addr_t inet_addr(const char *);
#include <netinet/in.h>
#include <arpa/inet.h>
#include <string.h>
#ifdef __osf__
#include <unistd.h>
#else
#if !defined(linux) && !defined(CSRG_BASED) && !defined(sun)
#include <osfcn.h>
#endif
#endif /* __osf */
#define X_INCLUDE_NETDB_H
#define XOS_USE_XT_LOCKING
@@ -162,14 +158,8 @@ init_byaddr(_Tt_string addr)
int _Tt_host::
init_bystringaddr(_Tt_string addr)
{
#ifdef __osf__
unsigned int *ip_address;
unsigned int ip_address_buf;
#else
unsigned long *ip_address;
unsigned long ip_address_buf;
#endif
struct hostent *addr_ret;
_Xgethostbynameparams addr_buf;

5
cde/lib/tt/lib/util/tt_iostream.C
View File

@@ -225,9 +225,8 @@ _Tt_ostream::operator <<(
return *this;
}
#if defined(__osf__) || defined(linux) || defined(CSRG_BASED)
/* This operator is being added to take care of uid_t and gid_t
* for osf */
#if defined(linux) || defined(CSRG_BASED)
// This operator is being added to take care of uid_t and gid_t
const _Tt_ostream &
_Tt_ostream::operator <<(
unsigned int n

2
cde/lib/tt/lib/util/tt_iostream.h
View File

@@ -86,7 +86,7 @@ class _Tt_ostream : public virtual _Tt_allocated {
const _Tt_ostream &operator <<(
int n
) const;
#if defined(__osf__) || defined(linux) || defined(CSRG_BASED)
#if defined(linux) || defined(CSRG_BASED)
const _Tt_ostream &operator <<(
unsigned int n
) const;

4
cde/lib/tt/lib/util/tt_log.C
View File

@@ -34,13 +34,9 @@
#include <stdio.h>
#include <stdlib.h>
#ifdef __osf__
#include <unistd.h>
#else
#if !defined(linux) && !defined(CSRG_BASED) && !defined(sun)
#include <osfcn.h>
#endif
#endif /* __osf__ */
#define X_INCLUDE_TIME_H
#define XOS_USE_XT_LOCKING

2
cde/lib/tt/lib/util/tt_object_list.h
View File

@@ -37,7 +37,7 @@
#include <rpc/rpc.h>
#include <util/tt_ptr.h>
#include <util/tt_object.h>
#if defined(OPT_BUG_HPUX) || defined(OPT_BUG_AIX) || defined(__osf__)
#if defined(OPT_BUG_HPUX) || defined(OPT_BUG_AIX)
# undef remove
#endif

15
cde/lib/tt/lib/util/tt_port.C
View File

@@ -122,15 +122,6 @@ _tt_gethostname()
}
#endif /* OPT_GETHOSTNAME */
#ifdef __osf__
// An environment variable will be created by /usr/dt/bin/Xsession if
// we have started the system without a network configured. This will
// be true during an initial system installation.
if (getenv("DTNONETWORK"))
result = default_hostname;
#endif
return result;
}
@@ -209,11 +200,11 @@ _tt_gethostid(void)
sscanf(serial_num, "%12lx", &_hostid);
}
}
#elif defined(hpux) || defined(_AIX) || defined(__osf__)
#elif defined(hpux) || defined(_AIX)
struct utsname uts_name;
uname(&uts_name);
# if defined(_AIX) || defined(__osf__)
# if defined(_AIX)
_hostid = atol(uts_name.machine);
# else
_hostid = atol(uts_name.idnumber);
@@ -374,7 +365,7 @@ _tt_vsyslog(
return;
}
#if defined(OPT_BUG_AIX) || defined(OPT_BUG_HPUX) || defined(__osf__)
#if defined(OPT_BUG_AIX) || defined(OPT_BUG_HPUX)
char buf[5000];
vsprintf( buf, _format, args );
syslog( priority, buf );

2
cde/lib/tt/lib/util/tt_string.h
View File

@@ -53,8 +53,6 @@ extern "C" {
#include <wctype.h>
#elif defined(OPT_BUG_AIX)
#include <string.h>
#elif defined(__osf__)
#include <wchar.h>
#endif
#include <rpc/rpc.h>

3
cde/lib/tt/lib/util/tt_tracefile_parse.C
View File

@@ -41,8 +41,7 @@
#include "util/tt_trace_parser.h"
#include "util/tt_entry_pt_names.h"
#if defined (_AIX) || defined(hpux) || defined(__osf__) || defined(linux) || \
defined(CSRG_BASED)
#if defined (_AIX) || defined(hpux) || defined(linux) || defined(CSRG_BASED)
#include <fcntl.h>
#endif

4
cde/lib/tt/lib/util/tt_xdr_utils.C
View File

@@ -81,7 +81,7 @@ tt_x_putbytes(XDR *xp, caddr_t, int len)
return TRUE;
}
#if defined(ultrix) || defined(__osf__)
#if defined(ultrix)
static int*
#elif defined(CSRG_BASED)
static int32_t*
@@ -104,7 +104,7 @@ tt_x_inline(XDR *xp, int len)
*/
if (len > 0 && (caddr_t) (intptr_t) len < xp->x_base) {
xp->x_handy += RNDUP (len);
#if defined(ultrix) || defined(__osf__)
#if defined(ultrix)
return (int *) xp->x_private;
#elif defined(CSRG_BASED)
return (int32_t *) xp->x_private;

2
cde/lib/tt/slib/mp_s_session.C
View File

@@ -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(ultrix) || defined(_AIX) || defined(hpux)
int servlen = strlen(server_addr.sun_path) + sizeof(server_addr.sun_fam\
ily);
if (bind(sock, (struct sockaddr *)&server_addr,servlen) < 0) {