From: chase Date: Sun, 20 May 2018 00:50:35 +0000 (-0500) Subject: Remove Unixware and openserver support X-Git-Tag: 2.2.4a~34 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=07900bd93b96be348da33cd29c7d5ec42f72732e;p=oweals%2Fcde.git Remove Unixware and openserver support --- diff --git a/cde/.gitignore b/cde/.gitignore index 8f701875..6784f8e9 100644 --- a/cde/.gitignore +++ b/cde/.gitignore @@ -107,7 +107,6 @@ install.dt.dec install.dt.hp install.dt.ibm install.dt.sun -install.dt.usl dinstall.dt dinstallCDE installCDE @@ -238,7 +237,6 @@ programs/dtappbuilder/src/ab/Makefile.aix programs/dtappbuilder/src/ab/Makefile.hpux programs/dtappbuilder/src/ab/Makefile.osf1 programs/dtappbuilder/src/ab/Makefile.sunos -programs/dtappbuilder/src/ab/Makefile.unixware programs/dtappbuilder/src/ab/Makefile.linux programs/dtappbuilder/src/ab/Makefile.freebsd programs/dtappbuilder/src/ab/Makefile.netbsd @@ -2335,7 +2333,6 @@ programs/ttsnoop/Makefile.aix programs/ttsnoop/Makefile.hpux programs/ttsnoop/Makefile.osf1 programs/ttsnoop/Makefile.sunos -programs/ttsnoop/Makefile.unixware programs/ttsnoop/Makefile.linux programs/ttsnoop/Makefile.freebsd programs/ttsnoop/Makefile.netbsd diff --git a/cde/admin/IntegTools/Imakefile b/cde/admin/IntegTools/Imakefile index 675aef76..a3ba5657 100644 --- a/cde/admin/IntegTools/Imakefile +++ b/cde/admin/IntegTools/Imakefile @@ -17,11 +17,6 @@ LOCAL_CPP_DEFINES=-Usun OVERRIDE=install.dt.sun #endif -#ifdef USLArchitecture -LOCAL_CPP_DEFINES=-Uusl -OVERRIDE=install.dt.usl -#endif - #ifdef AlphaArchitecture OVERRIDE=install.dt.dec #endif diff --git a/cde/admin/IntegTools/config/config.sco b/cde/admin/IntegTools/config/config.sco deleted file mode 100644 index 60848ea0..00000000 --- a/cde/admin/IntegTools/config/config.sco +++ /dev/null @@ -1,79 +0,0 @@ -#################################### -### Instructions for SCO Systems ### -#################################### - -System Requirements -=================== - - * SCO Open Desktop or SCO Open Server Version 3.0 - * 386-33, 486, or Pentium based processor - * 16MB memory - * 1024x768, 256 color graphics system - * 70MB free disk space - * 30MB Swap Space - - -Before You Start the Desktop -============================ - -If your system has one of these special configurations, you may need to -edit certain Login Manager files before starting the desktop. See -chapter 2 of the Getting Started Guide: - - - * If the system console is a non-bitmap device. - - * If the system is an X terminal or a host for X terminals. - - * If the system has more than one display. - - - - -To Start and Stop the Desktop -============================ - -1. Log in as the user who will use the desktop and be running the Korn or - Bourne shells (ksh or sh). - -2. First, add the following two lines to your .profile: - - PATH=$PATH:/opt/dt/bin - . /opt/dt/bin/dtsearchpath - - These lines add the desktop search path to your PATH variable. - -3. If you have a .startxrc file in your home directory, move it to a - backup location or name by entering: - - mv .startxrc old.startxrc - -4. Copy /etc/opt/dt/dt.startxrc to your home directory and rename it - to .startxrc by entering: - - cp /etc/opt/dt/dt.startxrc .startxrc - -5. Do one of the following: - - * Log out of your ODT session and log in via Scologin. - - * Or, at a shell prompt on a multiscreen not running the X - server, run startx by entering: - - startx - - Be sure to log out to reinvoke your .profile correctly. - - - - - - - - - - - - - - diff --git a/cde/admin/IntegTools/config/config.usl b/cde/admin/IntegTools/config/config.usl deleted file mode 100644 index 285414a8..00000000 --- a/cde/admin/IntegTools/config/config.usl +++ /dev/null @@ -1,207 +0,0 @@ -######################################################################### -# Configuration Instructions for the UnixWare 1.1 or later Environments # -######################################################################### - -The following instructions assume you have already installed the Common Desktop -Environment according to the Installation Instructions on the CD jacket. - -There are two ways to start the desktop: - -* You can manually start the desktop Login Manager. This method can be used to -avoid rebooting the system. See the section To Start and Stop the Desktop -Manually . - -* You can configure the system to start the desktop automatically upon reboot. - See the section To Enable and Disable Desktop Auto-Start.. - - - -Before You Start the Desktop -============================ -****************************************************************************** -If you have a previous Common Desktop Environment (CDE) version on the system: -****************************************************************************** - -*Advise all CDE users on the system to remove or rename their $HOME/.dt directory -and their $HOME/.dtprofile. The new files are not compatible with the old -ones. If users have customized the $HOME/.dt/dtwmrc file and want to keep -it, they will need to cut and paste the appropriate pieces into the new dtwmrc -file provided. - -*Become the root user on the system. Make sure all other users on the system -are logged out of CDE. Kill the Login Manager if running. - - kill -15 `cat /etc/opt/dt/Xpid` - -Killing the Login Manager process works no matter how the process was started. -An alternate method is to stop the system resource control for the desktop. -This method should only be used if CDE was configured on the system by -replacing the /etc/rc2.d/S69xdm script. You can tell if CDE was configured -this way by checking the existence of /etc/S69xdm.old. If this file -exists, then do the following: - - mv /etc/S69xdm.old /etc/rc2.d/S69xdm - - - -Special Configurations ----------------------- - -If your system has one of these special configurations, you may need to -edit certain Login Manager files before starting the desktop. See the -Advanced User's and System Administrator's Guide: - - * If the system console is not a UnixWare supported bitmap device. - - * If the system is an X terminal or a host for X terminals. - - * If the system has more than one display. - - -To Start and Stop the Desktop Manually -====================================== - -There are two ways to start the desktop manually: - - - * You can manually start the CDE Login Manager, which will - display the desktop Login screen. To use this method, you - must have permission to log in as root. - - This method is preferable, since Login Manager sets certain - environment variables that are needed during desktop sessions. - - * You can log in using conventional methods, and then manually - run the CDE Session Manager, which starts a desktop session. - See the section Manually Starting and Stopping the Session - Manager. - -Manually Starting and Stopping Login Manager --------------------------------------------- - -When you use this method, you log in using the CDE Login screen. -When you log in, a desktop session starts. - -To manually start Login Manager: - -1. Log in as root. - -2. Type: - LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/dt/lib:/usr/X/lib export LD_LIBRARY_PATH - -3. With no window system running, from the command line enter: - - /usr/dt/bin/dtlogin -daemon - - The CDE Graphical Login screen will appear. - -4. For security reasons, you need to exit the shell that invoked dtlogin. - Type p - (i.e. Press the and keys at the same time, - release both and then hit 'p'. ) - - You should return to an ASCII terminal session. - -5. Type: - - exit - -6. You will be asked if you want your virtual terminals closed at once. - Type: n - - The CDE Graphical Login screen will reappear. - - -To manually stop Login Manager: - - 1. Log out of the CDE Desktop. - - 2. From the options menu of the CDE Graphical Login choose Command Line. - - This will give you the ASCII login screen. - - 3. Log in as root. - - 4. Type: - kill -15 `cat /usr/dt/config/Xpid` - - - -Manually Starting and Stopping Session Manager ----------------------------------------------- - -If you use this method, you are responsible for setting certain -environment variables to values required by the desktop if suitable -values are not already set in your environment. Refer to the Getting -Started Guide for setting the necessary environment variables. - - -1. Log in. (You do not need to log in as root). - -2. With no window system running, from the command line enter: - - LD_LIBRARY_PATH=/usr/dt/lib:/usr/X/lib:$LD_LIBRARY_PATH - export LD_LIBRARY_PATH - - PATH=$PATH:/usr/X/bin - export PATH - - /usr/X/bin/olinit /usr/dt/bin/Xsession - -The Session Manager stops when you log out. -When auto-start is enabled, the CDE Login Manager runs -automatically each time the system is booted. You then log -in using the CDE Login Screen. - - -To Enable and Disable Desktop Auto-Start -======================================== -UnixWare can be configured to start the CDE Desktop automatically when the system -is booted. This method starts CDE as the Session Manager for all users on -the system. - - -To Enable Desktop Auto-Start ----------------------------- - -1. Log in as root. - -2. From the command line, enter: - - NOTE: Step 'a' is necessay only if the /etc/rc2.d/S69xdm - script has been modified after UnixWare was - installed on your system and if the graphical login - is enabled. A copy of the S69xdm script that - came with the UnixWare installation is located - in /usr/X/adm. - - a. cp /etc/rc2.d/S69xdm /etc/S69xdm.preCDE - b. cp /usr/dt/config/S69xdm /etc/rc2.d/S69xdm - -A CDE Login screen will appear the next time the system is booted. - - -To Disable Desktop Auto-Start ------------------------------ - - - 1. Log in as root. - - 2. From a command line, enter: - - rm /etc/rc2.d/S69xdm - - If you would like the original UnixWare Desktop Manager Login - to appear upon reboot: - - /usr/X/bin/enable_glogin - - - OR - - - If a copy of S69xdm was saved as outlined in the section - "To Enable Desktop Auto-Start": - - mv /etc/S69xdm.preCDE /etc/rc2.d/S69xdm - - The UnixWare Desktop Manager Login will appear - the next time the system is rebooted. diff --git a/cde/admin/IntegTools/dbTools/Imakefile b/cde/admin/IntegTools/dbTools/Imakefile index e40443ce..d8371ad0 100644 --- a/cde/admin/IntegTools/dbTools/Imakefile +++ b/cde/admin/IntegTools/dbTools/Imakefile @@ -4,7 +4,7 @@ LOCAL_CPP_DEFINES = -DCDE_INSTALLATION_TOP=$(CDE_INSTALLATION_TOP) \ -DCDE_CONFIGURATION_TOP=$(CDE_CONFIGURATION_TOP) \ -DCDE_LOGFILES_TOP=$(CDE_LOGFILES_TOP) \ -DKORNSHELL=$(KORNSHELL) \ - -Usun -Uusl -Uaix -Udec -UAIX -Uibm -Uhp + -Usun -Uaix -Udec -UAIX -Uibm -Uhp AllTarget(installCDE dinstallCDE) diff --git a/cde/admin/IntegTools/dbTools/UDB.format b/cde/admin/IntegTools/dbTools/UDB.format index 98404179..52d77085 100644 --- a/cde/admin/IntegTools/dbTools/UDB.format +++ b/cde/admin/IntegTools/dbTools/UDB.format @@ -174,7 +174,7 @@ Pseudo-BNF: release_def = "{" release_id ":" "defaults" record_defs "}" - release_id = "hp-ux" | "aix" | "sun" | "usl" | "default" + release_id = "hp-ux" | "aix" | "sun" | "default" record_defs = keyword_def "=" special_token | keyword_def "=" keyword_value diff --git a/cde/admin/IntegTools/dbTools/dinstallCDE.src b/cde/admin/IntegTools/dbTools/dinstallCDE.src index 5a5ee1b9..98634f0a 100755 --- a/cde/admin/IntegTools/dbTools/dinstallCDE.src +++ b/cde/admin/IntegTools/dbTools/dinstallCDE.src @@ -154,10 +154,6 @@ XCOMM then PLATFORM=sun PLATFORM_SCRIPT_DIR=sun - elif [ $BUILDSYSTEM = "UNIX_SV" ]; - then - PLATFORM=usl - PLATFORM_SCRIPT_DIR=usl elif [ $BUILDSYSTEM = "OSF1" ]; then PLATFORM=dec @@ -170,7 +166,7 @@ XCOMM if [ "$PLATFORM" = "aix" ]; then USER=`/bin/whoami` - elif [ "$PLATFORM" = "sun" -o "$PLATFORM" = "usl" ]; + elif [ "$PLATFORM" = "sun" ]; then USER=`/usr/ucb/whoami` else diff --git a/cde/admin/IntegTools/dbTools/installCDE.src b/cde/admin/IntegTools/dbTools/installCDE.src index dcb50422..61e456a2 100755 --- a/cde/admin/IntegTools/dbTools/installCDE.src +++ b/cde/admin/IntegTools/dbTools/installCDE.src @@ -62,11 +62,6 @@ MakeTarball() HASH Log "Creating tarball..." - if [ $PLATFORM = "usl" ] - then - ulimit -f unlimited - fi - DIRNAME=build.$DATE mkdir -p $TARBALL_LOCATION/$DIRNAME cd / @@ -257,10 +252,7 @@ RestartInetd() OLDPWD=`pwd` cd / - if [ "$PLATFORM" = "usl" ] - then - /usr/sbin/inetd -s - elif [ "$PLATFORM" = "sun" ] + if [ "$PLATFORM" = "sun" ] then /usr/sbin/svcadm refresh svc:/network/inetd:default /usr/sbin/svcadm restart svc:/network/inetd:default @@ -569,10 +561,6 @@ XCOMM then PLATFORM=sun PLATFORM_SCRIPT_DIR=sun - elif [ $BUILDSYSTEM = "UNIX_SV" ]; - then - PLATFORM=usl - PLATFORM_SCRIPT_DIR=usl elif [ $BUILDSYSTEM = "OSF1" ]; then PLATFORM=dec @@ -601,9 +589,6 @@ XCOMM if [ "$PLATFORM" = "aix" ]; then USER=`/bin/whoami` - elif [ "$PLATFORM" = "usl" ]; - then - USER=`/usr/ucb/whoami` else USER=`/usr/bin/whoami` fi @@ -615,11 +600,6 @@ XCOMM echo "" fi - if [ "$PLATFORM" = "usl" ] - then - umask 000 - fi - unset TMPDIR CLEANING="no" diff --git a/cde/admin/IntegTools/dbTools/mkProd b/cde/admin/IntegTools/dbTools/mkProd index 69dfe3f2..a7b09d6b 100755 --- a/cde/admin/IntegTools/dbTools/mkProd +++ b/cde/admin/IntegTools/dbTools/mkProd @@ -92,9 +92,6 @@ then elif [ $BUILDSYSTEM = "SunOS" ]; then PLATFORM=sun -elif [ $BUILDSYSTEM = "UNIX_SV" ]; -then - PLATFORM=usl elif [ $BUILDSYSTEM = "OSF1" ]; then PLATFORM=dec @@ -105,9 +102,6 @@ fi if [ $PLATFORM = "aix" ]; then USER=`/bin/whoami` -elif [ $PLATFORM = "usl" ]; -then - USER=`/usr/ucb/whoami` else USER=`/usr/bin/whoami` fi diff --git a/cde/admin/IntegTools/dinstall.dt.src b/cde/admin/IntegTools/dinstall.dt.src index 813fd0f4..06d7dd62 100755 --- a/cde/admin/IntegTools/dinstall.dt.src +++ b/cde/admin/IntegTools/dinstall.dt.src @@ -143,7 +143,6 @@ XCOMM Return XCOMM "hpux" XCOMM "aix" XCOMM "sun" -XCOMM "usl" XCOMM "dec" XCOMM ========================================================================== @@ -155,7 +154,6 @@ GetPlatform() *HP-UX*) getPlatform=hp;; *AIX*) getPlatform=ibm;; *SunOS*) getPlatform=sun;; - *UNIX_SV*) getPlatform=usl;; *OSF1*) getPlatform=dec;; esac fi @@ -174,7 +172,6 @@ XCOMM Return XCOMM "hpux" XCOMM "aix" XCOMM "sun" -XCOMM "usl" XCOMM "dec" XCOMM ========================================================================== @@ -182,7 +179,7 @@ ValidOS() { platform=$(GetPlatform) case "$platform" in - hp|ibm|sun|usl|dec) + hp|ibm|sun|dec) DtiReturn $platform ;; *) Exit $INVALID_OS_MSG 1 @@ -675,8 +672,6 @@ XCOMM set up the path for whoami command ;; sun) WHOAMI_PATH=/usr/ucb ;; - usl) WHOAMI_PATH=/usr/ucb - ;; dec) WHOAMI_PATH=/usr/bin ;; esac diff --git a/cde/admin/IntegTools/install.dt.src b/cde/admin/IntegTools/install.dt.src index 5727d663..a43fa29a 100644 --- a/cde/admin/IntegTools/install.dt.src +++ b/cde/admin/IntegTools/install.dt.src @@ -6,7 +6,7 @@ XCOMM ========================================================================== XCOMM install.dt XCOMM XCOMM Script to install the April 1994 Snapshot Desktop on -XCOMM HP, IBM, Sun, USL, or DEC Unix systems from a CDROM +XCOMM HP, IBM, Sun, or DEC Unix systems from a CDROM XCOMM XCOMM ========================================================================== XCOMM ========================================================================== @@ -167,7 +167,6 @@ XCOMM Return XCOMM "hpux" XCOMM "aix" XCOMM "sun" -XCOMM "usl" XCOMM "dec" XCOMM ========================================================================== @@ -179,7 +178,6 @@ GetPlatform() *HP-UX*) getPlatform=hp;; *AIX*) getPlatform=ibm;; *SunOS*) getPlatform=sun;; - *UNIX_SV*) getPlatform=usl;; *OSF1*) getPlatform=dec;; esac fi @@ -406,7 +404,7 @@ Main() HASH 3) verify platform is supported HASH case "$dtiPlatform" in - hp|ibm|sun|usl|dec) + hp|ibm|sun|dec) NewState 4.1 ;; *) diff --git a/cde/admin/IntegTools/install.dt.usl.src b/cde/admin/IntegTools/install.dt.usl.src deleted file mode 100644 index 043244ca..00000000 --- a/cde/admin/IntegTools/install.dt.usl.src +++ /dev/null @@ -1,174 +0,0 @@ -XCOMM $XConsortium: install.dt.usl.src /main/4 1996/04/23 11:19:27 drk $ -XCOMM ========================================================================== -XCOMM ========================================================================== -XCOMM install.dt.usl -XCOMM -XCOMM Platform specific function overrides for the April 1994 Snapshot -XCOMM install script, install.dt. -XCOMM -XCOMM This file is sourced by the install.dt script to allow platform -XCOMM specific behavior for certain functionality. These functions are: -XCOMM -XCOMM DtiClearScreen() - clear the screen -XCOMM DtiFreeSpace() - return available bytes in a directory -XCOMM DtiVerifyConfiguration() - verify system configuration -XCOMM DtiWhoami() - return user name -XCOMM -XCOMM ========================================================================== -#define HASH # - -XCOMM ========================================================================== -XCOMM -XCOMM DtiClearScreen() - clears the screen -XCOMM -XCOMM The default DtiClearScreen() uses the 'clear' command to clear the -XCOMM screen. If this platform does not have the 'clear' command, -XCOMM declare DtiClearScreen() here with the appropriate functionality. -XCOMM -XCOMM Note: The default DtiClearScreen() writes to stderr, rather than stdout, -XCOMM so be sure to do the same here. DtiPrint() does this automatically, so -XCOMM use it if possible. -XCOMM -XCOMM Example: -XCOMM -XCOMM DtiClearScreen() -XCOMM { -XCOMM DtiPrint "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n" -XCOMM DtiPrint "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n" -XCOMM } -XCOMM -XCOMM Input - none -XCOMM Output - none -XCOMM Return -none -XCOMM -XCOMM USL uses the default (clear). We'll define it here to ensure usage. -XCOMM ========================================================================== - -DtiClearScreen() { - clear 1>&2 -} - -XCOMM ========================================================================== -XCOMM -XCOMM DtiFreeSpace -XCOMM -XCOMM The default DtiFreeSpace() does not check for free space, rather it -XCOMM simply returns a BigNumber that install.dt will assume is large -XCOMM enough in which to install the desktop. -XCOMM -XCOMM Declare DtiFreeSpace() here to return the actual available space for -XCOMM a particular directory. -XCOMM -XCOMM The $1 parameter will contain the directory name to test. The directory -XCOMM specified will exist. DtiFreeSpace() should return the number of bytes -XCOMM available via the DtiReturn() function. -XCOMM -XCOMM Input -XCOMM $1 - directory name -XCOMM Output - none -XCOMM Return -XCOMM number of bytes available -XCOMM -XCOMM ========================================================================== - -DtiFreeSpace() -{ - blocks="$(df "$1" | sed 's/^.*://' | awk '{print $1}')" - case "$blocks" in - [0-9]*) let blocks=blocks*512 - DtiReturn "$blocks" ;; - *) DtiReturn "0" ;; # install.dt warn and confirm - esac -} - -XCOMM ========================================================================== -XCOMM -XCOMM DtiVerifyConfiguration -XCOMM -XCOMM The default DtiVerifyConfiguration() does no system configuration -XCOMM testing. For a particular platform, one might want to test for -XCOMM the presence of X11R5 or the OS version, for example, before allowing -XCOMM the desktop to be installed. -XCOMM -XCOMM Declare this function to make such platform specific tests. Return -XCOMM "yes" if the system passed, or "" if the system failed -XCOMM in which case install.dt will display the as the reason. -XCOMM -XCOMM Input - none -XCOMM Output - none -XCOMM Return -XCOMM "yes" - system configuration verified -XCOMM "" - verification failed, display message text -XCOMM -XCOMM ========================================================================== - -DtiVerifyConfiguration() -{ - if [ "$(uname -s)" = UNIX_SV -a "$(uname -r)" = 4.2 ] - then - if [ "$(uname -v)" = 1.0 ] - then - DtiReturn \ -"WARNING: THE CDE DESKTOP IS NOT SUPPORTED ON UnixWare 1.0" - else - HASH for all 4.2 releases after 1.0 - DtiReturn "yes" - fi - else - DtiReturn "ERROR: THIS IS NOT A \"UNIX_SV 4.2\" SYSTEM" - fi -} - -XCOMM ========================================================================== -XCOMM -XCOMM DtiWhoami -XCOMM -XCOMM The default DtiWhoami() uses the 'whoami' command to determine -XCOMM the user name. If this platform does not have the 'whoami' command, -XCOMM declare DtiWhoami() here with the appropriate functionality. -XCOMM -XCOMM Input - none -XCOMM Output - none -XCOMM Return -XCOMM result of system 'whoami' command -XCOMM -XCOMM ========================================================================== - -DtiWhoami() -{ - /usr/ucb/whoami -} - -XCOMM ========================================================================== -XCOMM -XCOMM DtiPrint - echo to stderr and log -XCOMM -XCOMM Input -XCOMM $1 - data to echo to stdout and log -XCOMM Output - none -XCOMM Return -none -XCOMM -XCOMM Override on UnixWare because of printf "%s" integer-const problem -XCOMM This coordinates with the leading blank in the passing of " $meg" in master. -XCOMM ========================================================================== - -DtiPrint() -{ - if [ "$#" -gt 1 ] - then - if [ "$#" -gt 5 ] - then - printf "$1" "$2" "$3" "$4" "$5" "$6" $7 $8 $9 >&2 - else - if [ "$#" -gt 4 ] - then - printf "$1" "$2" "$3" "$4" "$5" $6 $7 $8 $9 >&2 - else - printf "$1" "$2" $3 $4 $5 $6 $7 $8 $9 >&2 - fi - fi - else - printf "$1" $2 $3 $4 $5 $6 $7 $8 $9 >&2 - fi - Log "$1" $2 $3 $4 $5 $6 $7 $8 $9 -} diff --git a/cde/admin/IntegTools/post_install/Imakefile b/cde/admin/IntegTools/post_install/Imakefile index c3da3f0e..9993d4cd 100644 --- a/cde/admin/IntegTools/post_install/Imakefile +++ b/cde/admin/IntegTools/post_install/Imakefile @@ -40,10 +40,6 @@ SUBDIRS = ibm PLATFORM = sun SUBDIRS = sun #endif -#ifdef USLArchitecture -PLATFORM = usl -SUBDIRS = usl -#endif #ifdef AlphaArchitecture PLATFORM = dec SUBDIRS = dec diff --git a/cde/admin/IntegTools/post_install/dec/Imakefile b/cde/admin/IntegTools/post_install/dec/Imakefile index 36f49248..e88706fa 100644 --- a/cde/admin/IntegTools/post_install/dec/Imakefile +++ b/cde/admin/IntegTools/post_install/dec/Imakefile @@ -12,9 +12,6 @@ PLATFORM = aix PLATFORM = sun .NO_PARALLEL: #endif -#ifdef USLArchitecture -PLATFORM = usl -#endif #ifdef AlphaArchitecture PLATFORM = dec #endif diff --git a/cde/admin/IntegTools/post_install/freebsd/Imakefile b/cde/admin/IntegTools/post_install/freebsd/Imakefile index 947c8386..2627e9e6 100644 --- a/cde/admin/IntegTools/post_install/freebsd/Imakefile +++ b/cde/admin/IntegTools/post_install/freebsd/Imakefile @@ -18,9 +18,6 @@ PLATFORM = aix PLATFORM = sun .NO_PARALLEL: #endif -#ifdef USLArchitecture -PLATFORM = usl -#endif UDBTOANY = $(KORNSHELL) $(TOOL_DIR)/udbToAny.ksh BUILD_UDB_LIST = $(SHELL) ../build_udb_list diff --git a/cde/admin/IntegTools/post_install/ibm/Imakefile b/cde/admin/IntegTools/post_install/ibm/Imakefile index 1a04a9d5..2380ac55 100644 --- a/cde/admin/IntegTools/post_install/ibm/Imakefile +++ b/cde/admin/IntegTools/post_install/ibm/Imakefile @@ -12,10 +12,6 @@ PLATFORM = aix PLATFORM = sun .NO_PARALLEL: #endif -#ifdef USLArchitecture -PLATFORM = usl -#endif - all:: diff --git a/cde/admin/IntegTools/post_install/linux/Imakefile b/cde/admin/IntegTools/post_install/linux/Imakefile index ca001fc7..31e06c1b 100644 --- a/cde/admin/IntegTools/post_install/linux/Imakefile +++ b/cde/admin/IntegTools/post_install/linux/Imakefile @@ -15,9 +15,6 @@ PLATFORM = aix PLATFORM = sun .NO_PARALLEL: #endif -#ifdef USLArchitecture -PLATFORM = usl -#endif all:: diff --git a/cde/admin/IntegTools/post_install/netbsd/Imakefile b/cde/admin/IntegTools/post_install/netbsd/Imakefile index 4174ad60..fb1a6540 100644 --- a/cde/admin/IntegTools/post_install/netbsd/Imakefile +++ b/cde/admin/IntegTools/post_install/netbsd/Imakefile @@ -24,9 +24,6 @@ PLATFORM = aix PLATFORM = sun .NO_PARALLEL: #endif -#ifdef USLArchitecture -PLATFORM = usl -#endif UDBTOANY = $(KORNSHELL) $(TOOL_DIR)/udbToAny.ksh BUILD_UDB_LIST = $(SHELL) ../build_udb_list diff --git a/cde/admin/IntegTools/post_install/openbsd/Imakefile b/cde/admin/IntegTools/post_install/openbsd/Imakefile index 653a4a43..1f365bcc 100644 --- a/cde/admin/IntegTools/post_install/openbsd/Imakefile +++ b/cde/admin/IntegTools/post_install/openbsd/Imakefile @@ -21,9 +21,6 @@ PLATFORM = aix PLATFORM = sun .NO_PARALLEL: #endif -#ifdef USLArchitecture -PLATFORM = usl -#endif UDBTOANY = $(KORNSHELL) $(TOOL_DIR)/udbToAny.ksh BUILD_UDB_LIST = $(SHELL) ../build_udb_list diff --git a/cde/admin/IntegTools/post_install/sun/Imakefile b/cde/admin/IntegTools/post_install/sun/Imakefile index 546ba820..80bc2667 100644 --- a/cde/admin/IntegTools/post_install/sun/Imakefile +++ b/cde/admin/IntegTools/post_install/sun/Imakefile @@ -12,9 +12,6 @@ PLATFORM = aix PLATFORM = sun .NO_PARALLEL: #endif -#ifdef USLArchitecture -PLATFORM = usl -#endif all:: diff --git a/cde/admin/IntegTools/post_install/usl/Imakefile b/cde/admin/IntegTools/post_install/usl/Imakefile deleted file mode 100644 index 2a095cd7..00000000 --- a/cde/admin/IntegTools/post_install/usl/Imakefile +++ /dev/null @@ -1,54 +0,0 @@ -XCOMM $XConsortium: Imakefile /main/5 1996/04/21 19:07:43 drk $ -TOOL_DIR = ../../dbTools -DATABASE_DIR = ../../../../databases - -#ifdef HPArchitecture -PLATFORM = hp-ux -#endif -#ifdef RsArchitecture -PLATFORM = aix -#endif -#ifdef SunArchitecture -PLATFORM = sun -.NO_PARALLEL: -#endif -#ifdef USLArchitecture -PLATFORM = usl -#endif - - -all:: - -configMin:: $(DATABASE_DIR)/CDE-MIN.udb - $(TOOL_DIR)/udbToAny.ksh -toLst -ReleaseStream $(PLATFORM) \ - $(DATABASE_DIR)/CDE-MIN.udb > CDE-MIN.lst - ../build_udb_list CDE-MIN ../../../.. - -configTT:: $(DATABASE_DIR)/CDE-TT.udb - $(TOOL_DIR)/udbToAny.ksh -toLst -ReleaseStream $(PLATFORM) \ - $(DATABASE_DIR)/CDE-TT.udb > CDE-TT.lst - ../build_udb_list CDE-TT ../../../.. - -configRun:: $(DATABASE_DIR)/CDE-RUN.udb - $(TOOL_DIR)/udbToAny.ksh -toLst -ReleaseStream $(PLATFORM) \ - $(DATABASE_DIR)/CDE-RUN.udb > CDE-RUN.lst - ../build_udb_list CDE-RUN ../../../.. - -configShlibs:: $(DATABASE_DIR)/CDE-SHLIBS.udb - $(TOOL_DIR)/udbToAny.ksh -toLst -ReleaseStream $(PLATFORM) \ - $(DATABASE_DIR)/CDE-SHLIBS.udb > CDE-SHLIBS.lst - ../build_udb_list CDE-SHLIBS ../../../.. - -LOCAL_CPP_DEFINES = -DCDE_INSTALLATION_TOP=$(CDE_INSTALLATION_TOP) \ - -DCDE_CONFIGURATION_TOP=$(CDE_CONFIGURATION_TOP) \ - -DCDE_LOGFILES_TOP=$(CDE_LOGFILES_TOP) - -AllTarget(configShlibs configTT configRun configMin) - -CppScriptTarget(configShlibs,configShlibs.src,$(LOCAL_CPP_DEFINES),) -CppScriptTarget(configTT,configTT.src,$(LOCAL_CPP_DEFINES),) -CppScriptTarget(configRun,configRun.src,$(LOCAL_CPP_DEFINES),) -CppScriptTarget(configMin,configMin.src,$(LOCAL_CPP_DEFINES),) - -clean:: - $(RM) *.lst *.list diff --git a/cde/admin/IntegTools/post_install/usl/S69xdm b/cde/admin/IntegTools/post_install/usl/S69xdm deleted file mode 100644 index 5315ede2..00000000 --- a/cde/admin/IntegTools/post_install/usl/S69xdm +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/sh -# -# Start X Display Manager for CDE -# -XNETACCESS=on #!@ Do not edit this line !@ -XWINHOME=/usr/X export XWINHOME #!@ (or your mount point) !@ -DTHOME=/usr/dt -PATH=$PATH:$XWINHOME/bin:$DTHOME/bin export PATH #!@ Do not edit this line !@ -LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$DTHOME/lib:$XWINHOME/lib export LD_LIBRARY_PATH #!@ Do not edit this line !@ - -XUSL=/usr/X/bin/X -XDMPROG="$DTHOME/bin/dtlogin" -XDM="$XDMPROG -daemon" - # Installed by els.4.2 package instance -XNLSPATH=$XWINHOME/lib/nls/elsXsi # Installed by els.4.2 package instance -XMODIFIERS=@im=Local # Installed by els.4.2 package instance -export XNLSPATH XMODIFIERS # Installed by els.4.2 package instance - -KillProgram() -{ - if [ "$#" -ne 2 ] - then - echo "usage: KillProgram -signal program-name" - fi - SIGNAL=$1 - PROGRAM=$2 - /bin/ps -ef | grep "$2" | grep -v grep >/tmp/tmppsout - if test -s /tmp/tmppsout - then - awk "{print \"kill $1 \" \$2}" /tmp/tmppsout | /bin/ksh - fi - rm -f /tmp/tmppsout -} - -case "$1" in - start) - if test -x $XDMPROG; then - if test -x $XUSL; then - rm -rf /var/dt/Xpid - exec $XDM - fi - fi - ;; - - stop) - KillProgram -15 dtlogin - ;; - - *) - echo "usage: S69xdm {start|stop}" - ;; -esac - diff --git a/cde/admin/IntegTools/post_install/usl/configHelp.src b/cde/admin/IntegTools/post_install/usl/configHelp.src deleted file mode 100755 index d5a4355e..00000000 --- a/cde/admin/IntegTools/post_install/usl/configHelp.src +++ /dev/null @@ -1,67 +0,0 @@ -XCOMM! /bin/ksh -XCOMM ####### -XCOMM Product: CDE -XCOMM Fileset: CDE-HELP -XCOMM customize -XCOMM @(#) $XConsortium: configHelp.src /main/5 1996/04/23 19:56:20 drk $ -XCOMM ####### -XCOMM -XCOMM (c) Copyright Hewlett-Packard Company, 1993 -XCOMM -XCOMM ####### -#define STAR * -XCOMM ############################################ -XCOMM # -XCOMM # HELP_symlinks -XCOMM # -XCOMM # create various symlinks -XCOMM # -XCOMM ############################################ -HELP_symlinks() -{ - HELP_LOC="appconfig/help" - theLANG="C" - DESTDIR=$CDE_CONF_TOP/$HELP_LOC/$theLANG - SRCDIR=$CDE_TOP/$HELP_LOC/$theLANG - EXT=".sdl" - - [ -d $DESTDIR ] || mkdir -p $DESTDIR - - for j in $CDE_TOP/$HELP_LOC/$theLANG/STAR - do - thedir=`basename $j` - if [[ -d $j && -f $j/${thedir}$EXT ]] - then - rm -f $DESTDIR/${thedir}$EXT - ln -s $j/${thedir}$EXT $DESTDIR/${thedir}$EXT - fi - done - - for j in $CDE_TOP/$HELP_LOC/$theLANG/STAR.hf - do - thefile=`basename $j` - rm -f $DESTDIR/$thefile - ln -s $CDE_TOP/$HELP_LOC/$theLANG/$thefile $DESTDIR/$thefile - done -} - -XCOMM ########################################################################## -XCOMM -XCOMM Main Body -XCOMM -XCOMM ########################################################################## - -PRODUCT=CDE -FILESET=CDE-HELP -retval=0 -CDE_TOP=CDE_INSTALLATION_TOP -CDE_CONF_TOP=CDE_CONFIGURATION_TOP - -XCOMM -XCOMM set up symlinks that point into the $CDE_TOP tree -XCOMM - -HELP_symlinks - -return $retval - diff --git a/cde/admin/IntegTools/post_install/usl/configHelpPrg.src b/cde/admin/IntegTools/post_install/usl/configHelpPrg.src deleted file mode 100755 index 3cd16fd9..00000000 --- a/cde/admin/IntegTools/post_install/usl/configHelpPrg.src +++ /dev/null @@ -1,65 +0,0 @@ -XCOMM! /bin/ksh -XCOMM ####### -XCOMM Product: CDE -XCOMM Fileset: CDE-HELP -XCOMM customize -XCOMM @(#) $XConsortium: configHelpPrg.src /main/5 1996/04/23 19:56:25 drk $ -XCOMM ####### -XCOMM -XCOMM (c) Copyright Hewlett-Packard Company, 1993 -XCOMM -XCOMM ####### -#define STAR * -XCOMM ############################################ -XCOMM # -XCOMM # HELP_symlinks -XCOMM # -XCOMM # create various symlinks -XCOMM # -XCOMM ############################################ -HELP_symlinks() -{ - DEST_HELP_LOC="appconfig/help" - SRC_HELP_LOC="dthelp/help" - theLang="C" - DESTDIR=$CDE_CONF_TOP/$DEST_HELP_LOC/$theLang - SRCDIR=$CDE_TOP/$SRC_HELP_LOC/$theLang - - [ -d $DESTDIR ] || mkdir -p $DESTDIR - - for j in $SRCDIR/STAR - do - dir=`basename $j` - for k in $j/STAR - do - file=`basename $k` - EXT=${file##*\.} - if [[ "$EXT" = "sdl" || "$EXT" = "hf" ]] - then - rm -f $DESTDIR/$file - ln -s $SRCDIR/$dir/$file $DESTDIR/$file - fi - done - done -} - -XCOMM ############################################################################# -XCOMM -XCOMM Main Body -XCOMM -XCOMM ############################################################################# - -PRODUCT=CDE -FILESET=CDE-HELP -retval=0 -CDE_TOP=CDE_INSTALLATION_TOP -CDE_CONF_TOP=CDE_CONFIGURATION_TOP - -XCOMM -XCOMM set up symlinks that point into the $CDE_TOP tree -XCOMM - -HELP_symlinks - -return $retval - diff --git a/cde/admin/IntegTools/post_install/usl/configMin.src b/cde/admin/IntegTools/post_install/usl/configMin.src deleted file mode 100644 index 90ed6a3a..00000000 --- a/cde/admin/IntegTools/post_install/usl/configMin.src +++ /dev/null @@ -1,197 +0,0 @@ -XCOMM! /bin/ksh -XCOMM ####### -XCOMM Product: CDE -XCOMM Fileset: CDE-MIN -XCOMM configure -XCOMM @(#) $XConsortium: configMin.src /main/4 1996/04/21 19:07:50 drk $ -XCOMM ####### -XCOMM -XCOMM (c) Copyright Hewlett-Packard Company, 1993 -XCOMM -XCOMM ####### - -PRODUCT=CDE -FILESET=CDE-MIN -DO_CONFIGURATION="" -retval=0 - -CheckForClobberedLinks() -{ -XCOMM -XCOMM ensure links not clobbered -XCOMM - - for file in services inetd.conf - do - if test ! -L /etc/$file - then if test -f /etc/$file - then - rm /etc/$file - ln -s /etc/inet/$file /etc/$file - fi - fi - done -} - -FixEtcInetServices() -{ -SERVICES=/etc/inet/services - -XCOMM -XCOMM see if it already exists -XCOMM - - nawk '{if ($1 == "dtspc") print $0 > "/tmp/dtspc-already-there"}' \ - $SERVICES >/dev/null - if [ ! -f /tmp/dtspc-already-there ] - then - if test ! -f ${SERVICES}.preCDE - then mv $SERVICES $SERVICES.preCDE - cp ${SERVICES}.preCDE $SERVICES - chmod 444 $SERVICES - fi - echo "dtspc\t6112/tcp\t#subprocess control" >>$SERVICES - else - rm /tmp/dtspc-already-there - fi - -XCOMM -XCOMM remove legacy entries like dtspcd -XCOMM - - nawk '{if ($1 == "dtspcd" || $1 == "#dtspcd") ; else print $0}' \ - $SERVICES >/tmp/etc-services - mv /tmp/etc-services $SERVICES - chmod 444 $SERVICES -} - -UnfixEtcInetServices() -{ -SERVICES=/etc/inet/services -TMPFILE=/tmp/etc-services - - nawk '{if ($1 == "dtspc" && $2 == "6112/tcp") - ; - else - print $0 - }' $SERVICES >$TMPFILE - - mv $TMPFILE $SERVICES -} - -FixInetdDotConf() -{ -INETD_CONF=/etc/inet/inetd.conf - -XCOMM -XCOMM see if it already exists -XCOMM - - nawk '{if ($1 == "dtspc") print $0 > "/tmp/dtspc-already-there"}' \ - $INETD_CONF >/dev/null - - if [ ! -f /tmp/dtspc-already-there ] - then - if test ! -f ${INETD_CONF}.preCDE - then mv $INETD_CONF $INETD_CONF.preCDE - cp ${INETD_CONF}.preCDE $INETD_CONF - chmod 444 $INETD_CONF - fi - DTSPCD=CDE_INSTALLATION_TOP/bin/dtspcd - echo "dtspc stream tcp nowait root $DTSPCD $DTSPCD" >>$INETD_CONF - else - rm /tmp/dtspc-already-there - fi - -XCOMM -XCOMM remove legacy entries like dtspcd -XCOMM - - nawk '{if ($1 == "dtspcd" || $1 == "#dtspcd") ; else print $0}' \ - $INETD_CONF >/tmp/etc-inetd-conf - mv /tmp/etc-inetd-conf $INETD_CONF - chmod 444 $INETD_CONF -} - -UnfixInetdDotConf() -{ -INETD_CONF=/etc/inet/inetd.conf -TMPFILE=/tmp/inetd.conf - - nawk '{if ($1 == "dtspc") - ; - else - print $0 - }' $INETD_CONF >$TMPFILE - - mv $TMPFILE $INETD_CONF -} - -PokeInetd() -{ -XCOMM issue a SIGHUP to the inetd process - - ps -ef | grep inetd | grep -v grep >/tmp/tmppsout - if [ -s /tmp/tmppsout ] - then - nawk '{print "kill -HUP " $2}' /tmp/tmppsout | /bin/ksh - else - /usr/sbin/inetd -s - fi - rm /tmp/tmppsout -} - -VerifyInstalledFiles() -{ - echo "Status mode owner group filename" - echo "-----------------------------------------" -XCOMM exists correct correct correct /usr/dt/foo1 -XCOMM MISSING WRONG WRONG WRONG /usr/dt/foo2 -XCOMM exists the link is correct /usr/dt/link - - while read SRC - do -#include "../verify.func" - done <<-EOF -#include "CDE-MIN.lst" - EOF -} - -#include "../option.func" - -XCOMM #################################################################### -XCOMM -XCOMM Main body -XCOMM -XCOMM #################################################################### - - CheckForClobberedLinks - - HandleOption $* - - if [ "$OPERATION" = "configure" ] - then - - FixEtcInetServices - FixInetdDotConf - PokeInetd() - - elif [ "$OPERATION" = "deconfigure" ] - then - - UnfixEtcInetServices - UnfixInetdDotConf - PokeInetd() - - RemoveMinFiles - VerifyInstalledFiles - - elif [ "$OPERATION" = "verify" ] - then - - VerifyInstalledFiles - - fi - - return $retval - diff --git a/cde/admin/IntegTools/post_install/usl/configRun.src b/cde/admin/IntegTools/post_install/usl/configRun.src deleted file mode 100644 index 2a972232..00000000 --- a/cde/admin/IntegTools/post_install/usl/configRun.src +++ /dev/null @@ -1,306 +0,0 @@ -XCOMM! /bin/ksh -XCOMM ####### -XCOMM Product: CDE -XCOMM Fileset: CDE-RUN -XCOMM configure -XCOMM @(#) $XConsortium: configRun.src /main/7 1996/10/18 16:26:43 drk $ -XCOMM ####### - -#define HASH # -#define STAR * - -CreateAppConfigDirectory() -{ - HASH - HASH Create the APPCONFIG directory inside DT_CONFIG_TOP and create - HASH all of its subdirectories - HASH - - cd $DT_CONFIG_TOP - if [ ! -d $APPCONFIG ] - then - mkdir $APPCONFIG - fi - - cd $APPCONFIG - - for i in $APPCONFIG_DIRS - do - if [ ! -d $i ] - then - mkdir $i - fi - cd $i - HASH - HASH for each locale - HASH - for j in $DT_TOP/$APPCONFIG/$i/STAR - do - if [ ! -d `basename $j` ] - then - mkdir `basename $j` - fi - done - cd .. - done - -} - -FixInetdDotConf() -{ -FILE="/etc/inet/inetd.conf" -TMPFILE="/tmp/inetd.conf" - -XCOMM -XCOMM desired inetd.conf entry: -XCOMM 100068/2-4 dgram rpc/udp wait root CDE_INSTALLATION_TOP/bin/rpc.cmsd -XCOMM rpc.cmsd -XCOMM - -XCOMM -XCOMM ensure links not clobbered -XCOMM - - for file in services inetd.conf - do - if test ! -L /etc/$file - then if test -f /etc/$file - then - rm /etc/$file - ln -s /etc/inet/$file /etc/$file - fi - fi - done - - CMSD=CDE_INSTALLATION_TOP/bin/rpc.cmsd - nawk -v cmsd=$CMSD \ - '{if ($1 == "100068/2-4" && $6 != cmsd) - print "#cde " $0; - else - print $0 - }' $FILE >$TMPFILE - - if test ! -f ${FILE}.preCDE - then mv $FILE ${FILE}.preCDE - cp ${FILE}.preCDE $FILE - fi - mv $TMPFILE $FILE - chmod 444 $FILE - -XCOMM -XCOMM now see if there is an occurrence of cmsd -XCOMM - - rm -f /tmp/cmsd-already-there - nawk '{if ($7 == "rpc.cmsd" && $1 == "100068/2-4") print $0 > \ - "/tmp/cmsd-already-there"}' $FILE >/dev/null - -XCOMM -XCOMM if it is not there, add it -XCOMM - - if [ ! -f /tmp/cmsd-already-there ] - then - echo "100068/2-4 dgram rpc/udp wait root $CMSD rpc.cmsd" >>$FILE - else - rm /tmp/cmsd-already-there - fi -} - -UnfixInetdDotConf() -{ -FILE=/etc/inet/inetd.conf -TMPFILE=/tmp/inetd.conf -CMSD=CDE_INSTALLATION_TOP/bin/rpc.cmsd - - nawk -v cmsd=$CMSD \ - '{if ($1 == "100068/2-4" && $6 == cmsd) - ; - else - print $0 - }' $FILE >$TMPFILE - - mv $TMPFILE $FILE - - nawk '{if ($1 == "#cde" && $2 == "100068/2-4") { - $1 = $2; - $2 = "" - } - print $0 - }' $FILE >$TMPFILE - - mv $TMPFILE $FILE -} - -PokeInetd() -{ -XCOMM -XCOMM Schedule inetd to re-read inetd.conf with SIGHUP. -XCOMM - ps -ef | grep inetd | grep -v grep >/tmp/tmppsout - if test -s /tmp/tmppsout - then - nawk '{print "kill -HUP " $2}' /tmp/tmppsout | /bin/ksh - else - /usr/sbin/inetd -s - fi - rm -f /tmp/tmppsout -} - -doDttermTerminfo() -{ - if [ -f $DT_TOP/config/dtterm.ti ] - then - tic $DT_TOP/config/dtterm.ti - if [ -f /usr/share/lib/terminfo/d/dtterm ] - then - chown bin /usr/share/lib/terminfo/d/dtterm - chgrp bin /usr/share/lib/terminfo/d/dtterm - chmod 644 /usr/share/lib/terminfo/d/dtterm - else - echo "Unable to compile $DT_TOP/config/dtterm.ti" - fi - else - echo "Unable to find $DT_TOP/config/dtterm.ti" - fi -} - -RemoveRunFiles() -{ - while read SRC - do - if [ "$SRC" != "" ] - then - rm -f $SRC - dirname=${SRC%/STAR} - if [ -d $dirname ] - then - cd $dirname - while [ "$dirname" != "$CDE_TOP" ] - do - cd .. - rmdir ${dirname##STAR/} >/dev/null 2>/dev/null - dirname=${dirname%/STAR} - done - fi - fi - done <<-EOF -#include "CDE-RUN.list" - EOF -} - - -VerifyInstalledFiles() -{ - echo "Status mode owner group filename" - echo "-----------------------------------------" -XCOMM exists correct correct correct /usr/dt/foo1 -XCOMM MISSING WRONG WRONG WRONG /usr/dt/foo2 -XCOMM exists the link is correct /usr/dt/link - - while read SRC - do -#include "../verify.func" - done <<-EOF -#include "CDE-RUN.lst" - EOF -} - -#include "../option.func" - -XCOMM ###################################################################### -XCOMM -XCOMM Main body -XCOMM -XCOMM ###################################################################### - -PRODUCT=CDE -FILESET=CDE-RUN -retval=0 - -DT_TOP=CDE_INSTALLATION_TOP -DT_CONFIG_TOP=CDE_CONFIGURATION_TOP -DT_TEMP_TOP=CDE_LOGFILES_TOP -ROOT=/ - -retval=0 - -APPCONFIG=appconfig -APPCONFIG_DIRS="appmanager help icons types" - - HandleOption $* - - if [ "$OPERATION" = "configure" ] - then - - HASH - HASH create the CDE_LOGFILES_TOP directory - HASH - if [ ! -d $DT_TEMP_TOP/$APPCONFIG/appmanager ] - then - mkdir -p $DT_TEMP_TOP/$APPCONFIG/appmanager - fi - cd $DT_TEMP_TOP - mv $APPCONFIG/appmanager .hidden-appmanager - chmod -R 755 * - chmod 755 .hidden-appmanager - chown -R bin * - chgrp -R bin * - mv .hidden-appmanager $APPCONFIG/appmanager - chmod 755 . - chown bin . - chgrp bin . - - HASH - HASH create the CDE_CONFIGURATION_TOP and its config directory - HASH - if [ ! -d $DT_CONFIG_TOP ] - then - mkdir -p $DT_CONFIG_TOP - fi - if [ ! -d $DT_CONFIG_TOP/config ] - then - mkdir -p $DT_CONFIG_TOP/config - fi - - CreateAppConfigDirectory - - HASH - HASH Create default printer actions - HASH - env LANG=C /usr/dt/bin/dtprintinfo -populate - - HASH - HASH Configure Xsession.d - HASH - - cd $DT_CONFIG_TOP/config - if [ ! -d Xsession.d ] - then - mkdir Xsession.d - fi - - cd $DT_CONFIG_TOP - chmod -R 755 * - - FixInetdDotConf - PokeInetd - - doDttermTerminfo - - elif [ "$OPERATION" = "deconfigure" ] - then - - UnfixInetdDotConf - PokeInetd - RemoveRunFiles - VerifyInstalledFiles - - elif [ "$OPERATION" = "verify" ] - then - - VerifyInstalledFiles - - fi - - return $retval diff --git a/cde/admin/IntegTools/post_install/usl/configShlibs.src b/cde/admin/IntegTools/post_install/usl/configShlibs.src deleted file mode 100755 index de578e28..00000000 --- a/cde/admin/IntegTools/post_install/usl/configShlibs.src +++ /dev/null @@ -1,114 +0,0 @@ -XCOMM!/bin/ksh -XCOMM $XConsortium: configShlibs.src /main/6 1996/06/13 16:38:59 drk $ - -XCOMM (c) Copyright 1996 Digital Equipment Corporation. -XCOMM (c) Copyright 1996 Hewlett-Packard Company. -XCOMM (c) Copyright 1996 International Business Machines Corp. -XCOMM (c) Copyright 1996 Sun Microsystems, Inc. -XCOMM (c) Copyright 1996 Novell, Inc. -XCOMM (c) Copyright 1996 FUJITSU LIMITED. -XCOMM (c) Copyright 1996 Hitachi. - -#define STAR * - -XCOMM ############################################ -RemoveShlibFiles() -{ - while read SRC - do - if [ "$SRC" != "" ] - then - rm -f $SRC - dirname=${SRC%/STAR} - if [ -d $dirname ] - then - cd $dirname - while [ "$dirname" != "$CDE_TOP" ] - do - cd .. - rmdir ${dirname##STAR/} >/dev/null 2>/dev/null - dirname=${dirname%/STAR} - done - fi - fi - done <<-EOF -#include "CDE-SHLIBS.list" - EOF -} - -VerifyInstalledFiles() -{ - echo "Status mode owner group filename" - echo "-----------------------------------------" -XCOMM exists correct correct correct /usr/dt/foo1 -XCOMM MISSING WRONG WRONG WRONG /usr/dt/foo2 -XCOMM exists the link is correct /usr/dt/link - - while read SRC - do -#include "../verify.func" - done <<-EOF -#include "CDE-SHLIBS.lst" - EOF -} - -#include "../option.func" - -MakeTheLink() -{ -XCOMM -XCOMM Usage: configShlibs -XCOMM -XCOMM creates links in the install tree libtt.so -> libtt.so.1 -XCOMM - - cd CDE_INSTALLATION_TOP/lib - - for lib in `/bin/ls *.so.*` - do - echo " Creating symlink for $lib" - - link=`echo $lib | cut -d. -f1,2` - - rm -f $link - ln -s $lib $link - - done -} - -XCOMM ########################################################################## -XCOMM -XCOMM Main Body -XCOMM -XCOMM ########################################################################## - -PRODUCT=CDE -FILESET=CDE-SHLIBS -retval=0 -CDE_TOP=CDE_INSTALLATION_TOP -CDE_CONF_TOP=CDE_CONFIGURATION_TOP - - HandleOption $* - - if [ "$OPERATION" = "deconfigure" ] - then - - echo "de-Configuring for CDE-SHLIBS..." - - RemoveShlibFiles - - VerifyInstalledFiles - - elif [ "$OPERATION" = "configure" ] - then - - MakeTheLink - - elif [ "$OPERATION" = "verify" ] - then - - VerifyInstalledFiles - - fi - - return $retval diff --git a/cde/admin/IntegTools/post_install/usl/configTT.src b/cde/admin/IntegTools/post_install/usl/configTT.src deleted file mode 100644 index 5b7494a3..00000000 --- a/cde/admin/IntegTools/post_install/usl/configTT.src +++ /dev/null @@ -1,101 +0,0 @@ -XCOMM! /bin/ksh -XCOMM ####### -XCOMM Product: CDE -XCOMM Fileset: CDE-TT -XCOMM configure -XCOMM @(#) $XConsortium: configTT.src /main/5 1996/04/21 19:08:00 drk $ -XCOMM ####### -XCOMM -XCOMM (c) Copyright Hewlett-Packard Company, 1993 -XCOMM -XCOMM ####### - -PRODUCT=CDE -FILESET=CDE-TT -DO_CONFIGURATION="" -retval=0 - -DeconfigureTtDbserver() -{ - /usr/sbin/pmadm -d -p tcp -s ttdbserverd >/dev/null 2>&1 - /usr/sbin/pmadm -r -p tcp -s ttdbserverd >/dev/null 2>&1 - /usr/sbin/sacadm -x -p tcp -} - -ConfigureTtDbserver() -{ - /usr/sbin/pmadm -d -p tcp -s ttdbserverd >/dev/null 2>&1 - /usr/sbin/pmadm -r -p tcp -s ttdbserverd >/dev/null 2>&1 - /usr/sbin/pmadm -a -t listen -s ttdbserverd -i root -m `/usr/sbin/nlsadmin -c /usr/dt/bin/rpc.ttdbserverd -D -R 100083:1` -v `/usr/sbin/nlsadmin -V` - /usr/sbin/sacadm -x -p tcp -} - -RemoveTTFiles() -{ - while read SRC - do - if [ "$SRC" != "" ] - then - rm -f $SRC - dirname=${SRC%/STAR} - if [ -d $dirname ] - then - cd $dirname - while [ "$dirname" != "$CDE_TOP" ] - do - cd .. - rmdir ${dirname##STAR/} >/dev/null 2>/dev/null - dirname=${dirname%/STAR} - done - fi - fi - done <<-EOF -#include "CDE-TT.list" - EOF -} - -VerifyInstalledFiles() -{ - echo "Status mode owner group filename" - echo "-----------------------------------------" -XCOMM exists correct correct correct /usr/dt/foo1 -XCOMM MISSING WRONG WRONG WRONG /usr/dt/foo2 -XCOMM exists the link is correct /usr/dt/link - - while read SRC - do -#include "../verify.func" - done <<-EOF -#include "CDE-TT.lst" - EOF -} - -#include "../option.func" - -XCOMM ################################################################ -XCOMM -XCOMM Main Body -XCOMM -XCOMM ################################################################ - - HandleOption $* - - if [ "$OPERATION" = "configure" ] - then - ConfigureTtDbserver - - elif [ "$OPERATION" = "deconfigure" ] - then - - DeconfigureTtDbserver - RemoveTTFiles - VerifyInstalledFiles - - elif [ "$OPERATION" = "verify" ] - then - - VerifyInstalledFiles - - fi - - return $retval diff --git a/cde/admin/IntegTools/updateTools/updateCDE.src b/cde/admin/IntegTools/updateTools/updateCDE.src index 90c9ea24..8dd0c42a 100755 --- a/cde/admin/IntegTools/updateTools/updateCDE.src +++ b/cde/admin/IntegTools/updateTools/updateCDE.src @@ -44,9 +44,6 @@ XCOMM Set system elif [ $BUILDSYSTEM = "SunOS" ] then PLATFORM=sun - elif [ $BUILDSYSTEM = "UNIX_SV" ] - then - PLATFORM=usl elif [ $BUILDSYSTEM = "OSF1" ] then PLATFORM=dec diff --git a/cde/config/cf/DtInfo.tmpl b/cde/config/cf/DtInfo.tmpl index 79c845c1..11b42e53 100644 --- a/cde/config/cf/DtInfo.tmpl +++ b/cde/config/cf/DtInfo.tmpl @@ -159,10 +159,6 @@ PLATFORM=hpux PLATFORM=aix #elif defined(AlphaArchitecture) PLATFORM=digital -#elif defined(USLArchitecture) -PLATFORM=usl -#elif defined(SVR4Architecture) && defined(i386Architecture) -PLATFORM=usl #elif defined(SystemV4) && defined(i386) PLATFORM=solaris-386 #elif defined(SystemV4) diff --git a/cde/config/cf/Imake.cf b/cde/config/cf/Imake.cf index ae0ffdaa..248ad38e 100644 --- a/cde/config/cf/Imake.cf +++ b/cde/config/cf/Imake.cf @@ -259,28 +259,6 @@ XCOMM $TOG: Imake.cf /main/30 1998/04/28 13:55:25 barstow $ # define HPArchitecture #endif /* hpux */ -#ifdef sco -# define MacroIncludeFile -# define MacroFile sco.cf -# undef sco -# undef USL -# undef SYSV -# undef i386 -/* # define i386Architecture */ -# define SCOArchitecture -#endif /* sco */ - -#ifdef USL -# define MacroIncludeFile -# define MacroFile usl.cf -# undef USL -# undef SVR4 -# undef i386 -# define SVR4Architecture -# define i386Architecture -# define USLArchitecture -#endif /* USL */ - #ifdef NCR # define MacroIncludeFile # define MacroFile ncr.cf diff --git a/cde/config/cf/Imakefile b/cde/config/cf/Imakefile index d159a1df..37e738a4 100644 --- a/cde/config/cf/Imakefile +++ b/cde/config/cf/Imakefile @@ -92,7 +92,6 @@ sun.cf \ svr3.cf \ svr4.cf \ ultrix.cf \ -usl.cf \ x386.cf \ xfree86.cf diff --git a/cde/config/cf/sco.cf b/cde/config/cf/sco.cf deleted file mode 100644 index d97ce3c7..00000000 --- a/cde/config/cf/sco.cf +++ /dev/null @@ -1,72 +0,0 @@ -XCOMM platform: $XConsortium: sco.cf /main/5 1996/12/04 10:12:36 swick $ - -#ifndef OSName -#define OSName SCO OpenServer Release 5 -#endif -#ifndef OSVendor -#define OSVendor SCO -#endif -#ifndef OSMajorVersion -#define OSMajorVersion 5 -#endif -#ifndef OSMinorVersion -#define OSMinorVersion 0 -#endif -#ifndef OSTeenyVersion -#define OSTeenyVersion 0 -#endif - -#if OSMajorVersion < 5 /* Must be 3.2v4 (not fully tested) */ -#define StandardDefines -Dsco -Dsco324 -DSYSV -Di386 -#else -#define StandardDefines -Dsco -DSYSV -Di386 -#define DefaultCCOptions -b elf -#endif - -#define CcCmd cc -#define NeedWidePrototypes NO -#define ServerExtraDefines -DSTATIC_COLOR -DAVOID_GLYPHBLT -DPIXPRIV -#define ServerOSDefines -DDDXTIME -DDDXOSINIT -DSERVER_LOCK -#define ToolkitStringsABIOptions -intelabi -#define XawI18nDefines -DHAS_WCHAR_H -DHAS_ISW_FUNCS -#define ExtraLibraries -lsocket -#define ExtraLoadOptions -b elf -#define ThreadedX NO -#define HasThreadSafeAPI NO -#define HasNdbm YES -#define HasVFork YES -#define ExecableScripts YES -#define HasShadowPasswd YES - - -XCOMM Uncomment the following line to build static COFF libraries -XCOMM #define ForceNormalLib YES -#define SharedLibXmu NO - -#define XnestServer YES - -#define SystemV YES -#define LdCombineFlags -r - -#define HasLdRunPath YES -#define HasPoll YES -#define PatheticCpp YES -#define Malloc0ReturnsNull YES /* in case -lmalloc used */ - -#define ArCmdBase ar -#define AsCmd as -#define CppCmd /lib/cpp -#define LdCmd ld -#define LexCmd lex -#define MakeCmd make -#define YaccCmd yacc - -#define ConnectionFlags -DUNIXCONN -DLOCALCONN -DTCPCONN -DFD_SETSIZE=256 - -#include /* minor changes to sv4Lib.rules */ -#include - -#define DtSvcDefines -DMULTIBYTE -#define DtSearchDefines -DI18N_MSG DtSvcDefines -#define DtWidgetDefines DtSearchDefines -#define DtPrintDefines DtSearchDefines diff --git a/cde/config/cf/scoLib.rules b/cde/config/cf/scoLib.rules deleted file mode 100644 index 160ff8e6..00000000 --- a/cde/config/cf/scoLib.rules +++ /dev/null @@ -1,42 +0,0 @@ -XCOMM $XConsortium: scoLib.rules /main/2 1996/09/28 16:12:20 rws $ - -/* - * SharedLibraryTarget3 - 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. - * - * Work around SCO sh environment size problem. - */ -#ifndef SharedLibraryTarget3 -#define SharedLibraryTarget3(libname,rev,solist1,solist2,solist3,down,up) @@\ -AllTarget(Concat(lib,libname.so.rev)) @@\ - @@\ -Concat(lib,libname.so.rev): solist1 solist2 solist3 $(EXTRALIBRARYDEPS) @@\ - $(RM) $@~ @@\ - echo -n $(LD) -o up/$@~ $(SHLIBLDFLAGS) -h $@ solist1 " " > Concat(down/lib,cmd) @@\ - echo -n solist2 " " >> Concat(down/lib,cmd) @@\ - echo -n solist3 >> Concat(down/lib,cmd) @@\ - (cd down; $(SHELL) Concat(./lib,cmd)) @@\ - $(RM) $@ Concat(lib,tmp1) Concat(lib,tmp2) @@\ - $(MV) $@~ $@ @@\ - $(RM) Concat(lib,libname.so) @@\ - $(LN) $@ Concat(lib,libname.so) @@\ - LinkBuildLibrary($@) @@\ - LinkBuildLibrary(Concat(lib,libname.so)) @@\ - @@\ -clean:: @@\ - $(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so) - -#endif /* SharedLibraryTarget */ - -/* - * Redefine this so we can drop -b elf and build COFF objects for the - * archived library. This assumes -b elf is hanging out in CCOPTIONS - */ -#ifndef UnsharedLibObjCompile -#define UnsharedLibObjCompile(options) RemoveFile($@) @@\ - ClearmakeOSName \ - $(CC) -c $(CDEBUGFLAGS) $(THREADS_CFLAGS) $(ALLDEFINES) options $*.c @@\ - $(MV) $@ unshared/$@ -#endif - diff --git a/cde/config/cf/site.def b/cde/config/cf/site.def index 3a0e3370..0dac2ae5 100644 --- a/cde/config/cf/site.def +++ b/cde/config/cf/site.def @@ -33,8 +33,7 @@ XCOMM site: $TOG: site.def /main/23 1998/03/19 18:43:26 mgreess $ * the two following macros need to be defined directly (accordingly to the * TopLevelProject macro defined above). */ -# if defined(SunArchitecture) || defined(AIXArchitecture) \ - || defined(USLArchitecture) +# if defined(SunArchitecture) || defined(AIXArchitecture) # ifndef ProjectRulesFile # define ProjectRulesFile # endif @@ -74,7 +73,7 @@ XCOMM site: $TOG: site.def /main/23 1998/03/19 18:43:26 mgreess $ # endif # endif -# if defined(USLArchitecture) || defined(AIXArchitecture) +# if defined(AIXArchitecture) # define HasCplusplus YES # endif diff --git a/cde/config/cf/usl.cf b/cde/config/cf/usl.cf deleted file mode 100644 index 87c7e9d8..00000000 --- a/cde/config/cf/usl.cf +++ /dev/null @@ -1,121 +0,0 @@ -XCOMM platform: $TOG: usl.cf /main/51 1998/03/23 12:27:39 mgreess $ - -#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) - -#ifndef CcCmd -# define CcCmd /usr/ccs/bin/cc -#endif -#ifndef CplusplusCmd -# define CplusplusCmd /usr/ccs/bin/CC -#endif -#ifndef CplusplusFilt -# define CplusplusFilt /usr/ccs/bin/c++filt -#endif -#ifndef CplusplusDependIncludes -# define CplusplusDependIncludes -I/usr/include/CC -#endif - -#define BootstrapCFlags /* none needed */ -#define StandardDefines -DUSL -DSVR4 -Di386 -#define NeedWidePrototypes NO /* experimental */ -#define ServerExtraDefines -D__USLC__ XFree86ServerDefines -#define ServerOSDefines -DDDXTIME XFree86ServerOSDefines -#define ToolkitStringsABIOptions -intelabi -#if OSMajorVersion < 2 -#define XawI18nDefines -DHAS_WCTYPE_H -DHAS_ISW_FUNCS -#else -#define XawI18nDefines -DHAS_WCHAR_H -DHAS_ISW_FUNCS -#endif - -#if OSMajorVersion == 2 -# if OSMinorVersion == 0 -# define ExtraLibraries -lsocket -lnsl -lgen -lw -# else -# define ExtraLibraries -lsocket -lnsl -L/usr/ccs/lib -lgen -# endif - -# define ThreadedX YES -# define HasThreadSafeAPI NO - /* UnixWare does not have MT-safe pwd routines. */ -# define MTSafeAPIDefines -DXUSE_MTSAFE_API -DXNO_MTSAFE_PWDAPI \ - -DXNO_MTSAFE_GRPAPI -# define SystemMTDefines -D_REENTRANT -# define ThreadsLibraries -lthread -# define ThreadsCplusplusLibraries -lthread -# define DefaultCCOptions -W0,-2A -Xa -Dasm=__asm -#endif -#define BuildLibPathVar LD_LIBRARY_PATH - -#ifndef UseExportLists -# define UseExportLists YES -#endif - -#define GencatFlags -m - -#include - -/* - * When generating templates the UnixWare 2.02 C++ compiler leaves - * protected .i files behind. Remove them so other people can - * compile too. - */ -#ifndef ObjectCplusplusCompile -#define ObjectCplusplusCompile(options) RemoveFiles($@ $*.i) @@\ - ClearmakeOSName \ - $(CXX) -c $(CXXFLAGS) options $*.CCsuf -#endif - -/* USL does not have a shared regex library. */ -#define UseLocalRegex YES - -#define XmDefines \ - -DNO_REGCOMP -DNEED_STRCASECMP \ - -DSUPPORT_ZERO_WIDTH -DHAS_WIDECHAR_FUNCTIONS -#define DtSvcDefines -DMULTIBYTE -DNO_REGCOMP -#define DtSearchDefines -DI18N_MSG DtSvcDefines -#define DtWidgetDefines DtSearchDefines -#define DtPrintDefines DtSearchDefines - -#define HasStrcasecmp NO - -/* For DtHelp's TIFF processing routines. */ -#define LSBBitOrder YES - -#define ArchitectureDefines -DUSL_ARCHITECTURE - -#define ExportListGenSource elistgen.usl -#define ShlibExportListOpt(filename) Concat(-Bexport:,filename) - -/* Remove -lc because select.o is not relocatable. */ -/* Remove -lgen (and set UseLocalRegex) because no shared library exists. */ -#if OSMajorVersion == 2 -# if OSMinorVersion == 0 -# define SharedXmReqs $(LDPRELIBS) SharedXReqs -lsocket -lnsl -lw -# define SharedMrmReqs $(LDPRELIBS) $(XMLIB) SharedXReqs -lsocket -lnsl -lw -# define SharedUilReqs $(LDPRELIBS) $(MRESOURCELIB) $(XMLIB) SharedXReqs -lsocket -lnsl -lw -# else -# define SharedXmReqs $(LDPRELIBS) SharedXReqs -lsocket -lnsl -# define SharedMrmReqs $(LDPRELIBS) $(XMLIB) SharedXReqs -lsocket -lnsl -# define SharedUilReqs $(LDPRELIBS) $(MRESOURCELIB) $(XMLIB) SharedXReqs -lsocket -lnsl -# endif -#endif - -/* requires process locking for missing _r functions */ -#define TtClientLibs $(TTLIB) $(XTOOLLIB) $(XLIB) -#define TtClientDepLibs $(DEPTTLIB) $(DEPXTOOLLIB) $(DEPXLIB) - -#define CdeProjectDefines \ - -DANSICPP -DMULTIBYTE -DNLS16 -DNEED_STRCASECMP \ - -DOSMAJORVERSION=OSMajorVersion -DOSMINORVERSION=OSMinorVersion diff --git a/cde/config/cf/x386.cf b/cde/config/cf/x386.cf index a82255f9..1d9c7c80 100644 --- a/cde/config/cf/x386.cf +++ b/cde/config/cf/x386.cf @@ -52,14 +52,6 @@ XCOMM platform: $XConsortium: x386.cf /main/15 1996/09/28 16:14:00 rws $ #define PosixLibraries /**/ #endif -#ifdef SCO -#define OSDefines -DSCO -DBROKEN_FTOL -DNO_PROTOTYPE -D_SVID -#define OSVendor "Santa Cruz Operation Ltd." -#define LocalLibraries -lpt -#define SocketLibraries -lsocket -#define PosixLibraries /**/ -#endif - #ifdef ATT #define OSDefines -DATT #define OSVendor "AT&T" diff --git a/cde/config/imake/imakemdep.h b/cde/config/imake/imakemdep.h index 42b2d340..8a27ad03 100644 --- a/cde/config/imake/imakemdep.h +++ b/cde/config/imake/imakemdep.h @@ -73,18 +73,10 @@ in this Software without prior written authorization from The Open Group. #define imake_ccflags "-DSYSV" #endif -#if defined(USL) || defined(__USLC__) || defined(Oki) || defined(NCR) +#if defined(Oki) || defined(NCR) #define imake_ccflags "-Xa -DSVR4" #endif -/* SCO may define __USLC__ so put this after the USL check */ -#if defined(M_UNIX) || defined(_SCO_DS) -#ifdef imake_ccflags -#undef imake_ccflags -#endif -#define imake_ccflags "-Dsco" -#endif - #ifdef sony #if defined(SYSTYPE_SYSV) || defined(_SYSTYPE_SYSV) #define imake_ccflags "-DSVR4" @@ -208,7 +200,7 @@ in this Software without prior written authorization from The Open Group. * descriptor onto another, define such a mechanism here (if you don't * already fall under the existing category(ies). */ -#if defined(SYSV) && !defined(_CRAY) && !defined(Mips) && !defined(_SEQUENT_) && !defined(sco) +#if defined(SYSV) && !defined(_CRAY) && !defined(Mips) && !defined(_SEQUENT_) #define dup2(fd1,fd2) ((fd1 == fd2) ? fd1 : (close(fd2), \ fcntl(fd1, F_DUPFD, fd2))) #endif @@ -223,7 +215,7 @@ in this Software without prior written authorization from The Open Group. * all colons). One way to tell if you need this is to see whether or not * your Makefiles have no tabs in them and lots of @@ strings. */ -#if defined(sun) || defined(SYSV) || defined(SVR4) || defined(hcx) || defined(WIN32) || defined(sco) || defined(__llvm__) || (defined(AMOEBA) && defined(CROSS_COMPILE)) +#if defined(sun) || defined(SYSV) || defined(SVR4) || defined(hcx) || defined(WIN32) || defined(__llvm__) || (defined(AMOEBA) && defined(CROSS_COMPILE)) #define FIXUP_CPP_WHITESPACE #endif #ifdef WIN32 @@ -308,7 +300,7 @@ char *cpp_argv[ARGUMENTS] = { #ifdef unix "-Uunix", /* remove unix symbol so that filename unix.c okay */ #endif -#if defined(__386BSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(MACH) || defined(USL) || defined(sco) || defined(ISC) || defined(linux) || defined(__hpux__) || defined(__vxworks) +#if defined(__386BSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(MACH) || defined(ISC) || defined(linux) || defined(__hpux__) || defined(__vxworks) # ifdef __i386__ "-D__i386__", # endif @@ -365,9 +357,6 @@ char *cpp_argv[ARGUMENTS] = { #if defined(macII) || defined(_AUX_SOURCE) "-DmacII", /* Apple A/UX */ #endif -#if defined(USL) || defined(__USLC__) - "-DUSL", /* USL */ -#endif #ifdef sony "-Dsony", /* Sony */ #if !defined(SYSTYPE_SYSV) && !defined(_SYSTYPE_SYSV) && NEWSOS < 42 @@ -424,12 +413,6 @@ char *cpp_argv[ARGUMENTS] = { "-DSVR4", # endif #endif /* MOTOROLA */ -#if defined(M_UNIX) || defined(sco) - "-Dsco", -# if defined(sco324) - "-Dsco324", -# endif -#endif #ifdef i386 "-Di386", # ifdef SVR4 @@ -453,12 +436,6 @@ char *cpp_argv[ARGUMENTS] = { # endif # endif # endif -# ifdef SCO - "-DSCO", -# ifdef SCO324 - "-DSCO324", -# endif -# endif # ifdef ESIX "-DESIX", # endif @@ -493,12 +470,6 @@ char *cpp_argv[ARGUMENTS] = { # endif # endif # endif -# ifdef SCO - "-DSCO", -# ifdef SCO324 - "-DSCO324", -# endif -# endif # ifdef ESIX "-DESIX", # endif @@ -623,12 +594,6 @@ char *cpp_argv[ARGUMENTS] = { # define DEFAULT_OS_MINOR_REV "r %*[^.].%*d.%1s" # define DEFAULT_OS_TEENY_REV "r %*[^.].%*d.%*c%[0-9]" # define DEFAULT_OS_NAME "srvm %[^\n]" -#elif defined(USL) || defined(__USLC__) -/* uname -v returns "x.yz" or "x.y.z", e.g. "2.02" or "2.1.2". */ -# define DEFAULT_OS_MAJOR_REV "v %[0-9]" -# define DEFAULT_OS_MINOR_REV "v %*d.%1s" -# define DEFAULT_OS_TEENY_REV "v %*d.%*c%[.0-9]" -# define DEFAULT_OS_NAME "srvm %[^\n]" #elif defined(__osf__) /* uname -r returns "Wx.y", e.g. "V3.2" or "T4.0" */ # define DEFAULT_OS_MAJOR_REV "r %*[^0-9]%[0-9]" diff --git a/cde/config/util/elistgen.usl b/cde/config/util/elistgen.usl deleted file mode 100644 index 0923b526..00000000 --- a/cde/config/util/elistgen.usl +++ /dev/null @@ -1,219 +0,0 @@ -XCOMM!/bin/sh -XCOMM $XConsortium: elistgen.usl /main/2 1996/12/04 10:13:26 swick $ -XCOMM -XCOMM ######################################################################### -XCOMM Construct shared-library export lists for Novell based on standardized -XCOMM export list description file -XCOMM -XCOMM Usage: exportlistgen libFoo.so libFoo.elist > libFoo.lopt -XCOMM -XCOMM libFoo.so => shared library of interest -XCOMM libFoo.elist => Meta description of necessary export list. -XCOMM -XCOMM The output file, "libFoo.lopt" may then be passed to the linker to -XCOMM reconstruct the shared library. -XCOMM -XCOMM (c) Copyright 1996 Digital Equipment Corporation. -XCOMM (c) Copyright 1996 Hewlett-Packard Company. -XCOMM (c) Copyright 1996 International Business Machines Corp. -XCOMM (c) Copyright 1996 Sun Microsystems, Inc. -XCOMM (c) Copyright 1996 Novell, Inc. -XCOMM (c) Copyright 1996 FUJITSU LIMITED. -XCOMM (c) Copyright 1996 Hitachi. -XCOMM -XCOMM ######################################################################### - -XCOMM Utility programs -FILTER=CXXFILT # C++ symbol demangler -AWK=awk # awk - -XCOMM For nm, cat, pr, expand, awk, c++filt -PATH=/usr/bin:/bin:/usr/ucb:/usr/ccs/bin - -XCOMM Temporary files -EXPORTLIST=/tmp/elistgen1.$$ # list of export symbols from "libfoo.elist" -NMLIST=/tmp/elistgen2.$$ # name list from libfoo.sl -FILTLIST=/tmp/elistgen3.$$ # demangled (C++) version of NMLIST - -XCOMM Print useful information at the top of the output -echo "#" `date` -echo "# This linker options list was produced by" $0 -echo "# Input export list description taken from:" $2 -echo "# Target library:" $1 -echo "# Target Operating System:" `uname -msrv` -echo "# " - -XCOMM Extract the globally visible symbols from target library. -XCOMM The NMLIST generated here is later used to cross-check the symbols in the -XCOMM supplied export-list. -nm -p $1 | $AWK ' - / [TD] [^\$]/{print $3} # Text, Data, BSS, or Secondary symbols -' > $NMLIST - -XCOMM Demangle the global library symbols. This operation is necessary to convert -XCOMM mangled C++ symbols into their C++ notation. -${FILTER:-cat} $NMLIST > $FILTLIST - -XCOMM Clean up the export-list description file. -XCOMM Note that C++ symbols may have embedded spaces in them. -cat $2 | $AWK ' - BEGIN { - csyms = 0; # C language symbols in libfoo.list - cplusplus = 0; # C++ language symbols in libfoo.list - isyms = 0; # C internal symbols in libfoo.elist - iplusplus = 0; # C++ internal symbols in libfoo.elist - implicit = ""; # Handling of implicit symbols - } - $1 == "default" { - # A default clause suppresses warnings about implicit symbols. - if ($2 != "" && $2 != "force" && $2 != "public" && - $2 != "private" && $2 != "internal") { - print "# Warning: illegal default clause:", $2 | "cat 1>&2"; - next; - } - if (implicit != "") - print "# Warning: multiple default clauses." | "cat 1>&2"; - implicit = $2; - next; - } - $1 == "force" || $1 == "public" || $1 == "private" { - csyms ++; - print $1 ";;" $2; - next; - } - $1 == "publicC++" || $1 == "privateC++" { - cplusplus ++; - string = $2; - for (n = 3; n <= NF; n++) { - string = string " " $n; - } - print $1 ";;" string; - next; - } - $1 == "internal" { - isyms ++; - print $1 ";;" $2; - next; - } - $1 == "internalC++" { - iplusplus ++; - string = $2; - for (n = 3; n <= NF; n++) { - string = string " " $n; - } - print $1 ";;" string; - next; - } - $1 == "#line" || $1 == "#" { - # cpp will have removed comments, but may have added other stuff. - next; - } - NF > 0 { - print "# Warning: unrecognized directive:", $0 | "cat 1>&2"; - next; - } - END { - printf("# Exporting %d C and %d C++ symbols, hiding %d and %d.\n", - csyms, cplusplus, isyms, iplusplus) | "cat 1>&2"; - if (implicit != "") { - print "# Unspecified symbols are " implicit "." | "cat 1>&2"; - print "default;;" implicit; - } - } -' > $EXPORTLIST - -XCOMM Read in the above files and write result to stdout. The contents -XCOMM of NMLIST and FILTLIST are used to construct a symbol lookup table. -XCOMM The contents of EXPORTLIST are converted with the help of this table. -XCOMM Use ";" as a delimiter in the symbol lookup table. -(pr -m -s";" -t -w1024 $NMLIST $FILTLIST | expand -1; cat $EXPORTLIST) | $AWK ' - BEGIN { - FS = ";"; - implicit = 0; - } - NF == 2 { - # This is "pr" output, i.e., symbol translation table - syms[$2] = $1; - next; - } - NF == 3 && $1 == "default" { - # Treatment of unspecified symbols. - if ($3 == "internal") - implicit = 1; - else if ($3 == "private" || $3 == "privateC++") - implicit = 2; - else if ($3 == "public" || $3 == "publicC++") - implicit = 3; - else # $3 == "force" - implicit = 4; - next; - } - NF == 3 { - # Parse our instructions for this symbol. - if ($1 == "internal" || $1 == "internalC++") - export = 1; - else if ($1 == "private" || $1 == "privateC++") - export = 2; - else if ($1 == "public" || $1 == "publicC++") - export = 3; - else # $1 == "force" - export = 4; - - # Process it. - if (length(syms[$3]) > 0) { - # This symbol is present in the library. - if (donelist[$3]) - print "# Warning: Duplicate entry for", $3, - "in export list" | "cat 1>&2"; - if (donelist[$3] < export) { - if (export > 1) - print syms[$3]; - donelist[$3] = export; - } - } else { - # Do not complain about unknown forced-export symbols. - if (export == 4) { - print $3; - donelist[$3] = export; - } else - print "# Warning:", $3, - "was not in the nm list for this library" | "cat 1>&2"; - } - - next; - } - END { - # Ignore built-in linker symbols. - if (implicit == 0) { - if (!donelist["_DYNAMIC"]) - donelist["_DYNAMIC"] = 1; - if (!donelist["_GLOBAL_OFFSET_TABLE_"]) - donelist["_GLOBAL_OFFSET_TABLE_"] = 1; - if (!donelist["_edata"]) - donelist["_edata"] = 1; - if (!donelist["_end"]) - donelist["_end"] = 1; - if (!donelist["_etext"]) - donelist["_etext"] = 1; - } - - # Process implicit symbols. - for (i in syms) { - if (!donelist[i] && (length(syms[i]) > 0)) { - # Ignore C++ compiler symbols - if (implicit == 0 && - (syms[i] !~ /^__vtbl__[0-9]*_/) && - (syms[i] !~ /^__cpp_unixware_[0-9]*$/)) - print "# Warning:", syms[i], - "was not in the export list" | "cat 1>&2"; - if (implicit > 1) - print syms[i]; - } - } - } -' - -XCOMM Clean up temporary files -rm $EXPORTLIST -rm $NMLIST -rm $FILTLIST diff --git a/cde/databases/CDE-DEMOS.udb b/cde/databases/CDE-DEMOS.udb index 8ab4de4a..79450ebc 100644 --- a/cde/databases/CDE-DEMOS.udb +++ b/cde/databases/CDE-DEMOS.udb @@ -309,11 +309,6 @@ examples/dtdnd/Makefile.sun install_target = /usr/dt/share/examples/dtdnd/Makefile.SUN } # -examples/dtdnd/Makefile.usl -{ default - install_target = /usr/dt/share/examples/dtdnd/Makefile.USL -} -# examples/dtdnd/Makefile.ibm { default install_target = /usr/dt/share/examples/dtdnd/Makefile.IBM diff --git a/cde/databases/CDE-FONTS.udb b/cde/databases/CDE-FONTS.udb index b1b94d10..4e858fe5 100644 --- a/cde/databases/CDE-FONTS.udb +++ b/cde/databases/CDE-FONTS.udb @@ -89,28 +89,6 @@ responsible_project = cde_dt } -#>>------------------------------ -# Defaults for: sun -#<<------------------------------ -# -{ usl : defaults - install_target = - fileset = CDE-FONTS - type = file - status = di---- - processor = 378 - mode = 0444 - owner = bin - group = bin - link_source = - build_target = / - install_rule_name = - install_flags = - a_out_location = - order = 0 - responsible_project = cde_dt -} - #>>------------------------------------------------- # Defaults for: Digital #<<------------------------------------------------- @@ -680,24 +658,6 @@ programs/fontaliases/sun/ja/dtinfo.pcf.Z # type = sym_link #} -# -# for Novell -# -programs/fontaliases/novell/C/fonts.alias -{ usl - install_target = /usr/dt/config/xfonts/C/fonts.alias -} -# -programs/fontaliases/novell/C/fonts.dir -{ usl - install_target = /usr/dt/config/xfonts/C/fonts.dir -} -# -programs/fontaliases/novell/C/dtinfo.pcf.Z -{ usl - install_target = /usr/dt/config/xfonts/C/dtinfo.pcf.Z -} - # # for Digital # @@ -958,29 +918,6 @@ programs/fontaliases/postscript/ja/prolog.ps # install_target = /usr/dt/config/psfonts/zh_TW/prolog.ps #} -# -# For Novell -# -programs/fontaliases/postscript/ja/prolog.ps -{ usl - install_target = /usr/dt/config/psfonts/ja/prolog.ps -} -# -#programs/fontaliases/postscript/ko/prolog.ps -#{ usl -# install_target = /usr/dt/config/psfonts/ko/prolog.ps -#} -# -#programs/fontaliases/postscript/zh/prolog.ps -#{ usl -# install_target = /usr/dt/config/psfonts/zh/prolog.ps -#} -# -#programs/fontaliases/postscript/zh_TW/prolog.ps -#{ usl -# install_target = /usr/dt/config/psfonts/zh_TW/prolog.ps -#} - # # For Digital # diff --git a/cde/databases/CDE-HELP-LOC.src b/cde/databases/CDE-HELP-LOC.src index 6b1c6e63..5569dd4d 100644 --- a/cde/databases/CDE-HELP-LOC.src +++ b/cde/databases/CDE-HELP-LOC.src @@ -2999,77 +2999,6 @@ XCOMM ######################################################################### #endif #endif /* _AIX */ -XCOMM ######################################################################### -XCOMM -XCOMM Novell - Locale and platform specific entries -XCOMM -XCOMM ######################################################################### -#ifdef USL -#ifdef _GERMAN_ -/usr/dt/appconfig/help/de_DE.ISO8859-1 -{ usl - install_target = /usr/dt/appconfig/help/de - type = sym_link -} -#endif -#ifdef _SPANISH_ -/usr/dt/appconfig/help/es_ES.ISO8859-1 -{ usl - install_target = /usr/dt/appconfig/help/es - type = sym_link -} -#endif -#ifdef _FRENCH_ -/usr/dt/appconfig/help/fr_FR.ISO8859-1 -{ usl - install_target = /usr/dt/appconfig/help/fr - type = sym_link -} -#endif -#ifdef _ITALIAN_ -/usr/dt/appconfig/help/it_IT.ISO8859-1 -{ usl - install_target = /usr/dt/appconfig/help/it - type = sym_link -} -#endif -#ifdef _JAPANESE_ -/usr/dt/appconfig/help/ja_JP.dt-eucJP -{ usl - install_target = /usr/dt/appconfig/help/ja - type = sym_link -} -#endif -#ifdef _KOREAN_ -/usr/dt/appconfig/help/ko_KR.dt-eucKR -{ usl - install_target = /usr/dt/appconfig/help/ko - type = sym_link -} -#endif -#ifdef _SWEDISH_ -/usr/dt/appconfig/help/sv_SE.ISO8859-1 -{ usl - install_target = /usr/dt/appconfig/help/sv - type = sym_link -} -#endif -#ifdef _CHINESE_ -/usr/dt/appconfig/help/zh_CN.dt-eucCN -{ usl - install_target = /usr/dt/appconfig/help/zh_CN - type = sym_link -} -#endif -#ifdef _TAIWANESE_ -/usr/dt/appconfig/help/zh_TW.dt-eucTW -{ usl - install_target = /usr/dt/appconfig/help/zh_TW - type = sym_link -} -#endif -#endif /* USL */ - XCOMM ######################################################################### XCOMM XCOMM DEC - Locale and platform specific entries diff --git a/cde/databases/CDE-HELP-RUN.udb b/cde/databases/CDE-HELP-RUN.udb index cef4c169..ebe464be 100644 --- a/cde/databases/CDE-HELP-RUN.udb +++ b/cde/databases/CDE-HELP-RUN.udb @@ -513,8 +513,3 @@ lib/DtHelp/SunOS.lcx { sun install_target = /usr/dt/config/svc/SunOS.lcx } -# -lib/DtHelp/UNIX_SV.lcx -{ usl - install_target = /usr/dt/config/svc/UNIX_SV.lcx -} diff --git a/cde/databases/CDE-INFOLIB-LOC.src b/cde/databases/CDE-INFOLIB-LOC.src index 2ea58a4c..22648369 100644 --- a/cde/databases/CDE-INFOLIB-LOC.src +++ b/cde/databases/CDE-INFOLIB-LOC.src @@ -503,56 +503,6 @@ XCOMM ########################################################################## #endif /* _AIX */ - -XCOMM ########################################################################## -XCOMM -XCOMM Novell - Locale and platform specific entries -XCOMM -XCOMM ########################################################################## -#ifdef USL - -#ifdef _GERMAN_ -../infolib/de_DE.ISO8859-1 -{ usl - install_target = /usr/dt/infolib/de - type = sym_link -} -#endif - -#ifdef _SPANISH_ -../infolib/es_ES.ISO8859-1 -{ usl - install_target = /usr/dt/infolib/es - type = sym_link -} -#endif - -#ifdef _FRENCH_ -../infolib/fr_FR.ISO8859-1 -{ usl - install_target = /usr/dt/infolib/fr - type = sym_link -} -#endif - -#ifdef _ITALIAN_ -../infolib/it_IT.ISO8859-1 -{ usl - install_target = /usr/dt/infolib/it - type = sym_link -} -#endif - -#ifdef _JAPANESE_ -../infolib/ja_JP.dt-eucJP -{ usl - install_target = /usr/dt/infolib/ja - type = sym_link -} -#endif - -#endif /* USL */ - XCOMM ########################################################################## XCOMM XCOMM DEC - Locale and platform specific entries diff --git a/cde/databases/CDE-LOC.src b/cde/databases/CDE-LOC.src index 33418d62..96a92812 100644 --- a/cde/databases/CDE-LOC.src +++ b/cde/databases/CDE-LOC.src @@ -1706,378 +1706,6 @@ programs/dtimsstart/conf/aix/none #endif #endif /* _AIX */ -XCOMM ########################################################################## -XCOMM -XCOMM Novell - Locale and platform specific entries -XCOMM -XCOMM ########################################################################## -#ifdef USL -#ifdef _GERMAN_ -./de_DE.ISO8859-1 -{ usl - install_target = /usr/dt/app-defaults/de - type = sym_link -} -./de_DE.ISO8859-1 -{ usl - install_target = /usr/dt/appconfig/appmanager/de - type = sym_link -} -./de_DE.ISO8859-1 -{ usl - install_target = /usr/dt/appconfig/types/de - type = sym_link -} -./de_DE.ISO8859-1 -{ usl - install_target = /usr/dt/config/de - type = sym_link -} -./desc.de_DE.ISO8859-1 -{ usl - install_target = /usr/dt/share/palettes/desc.de - type = sym_link -} -./desc.de_DE.ISO8859-1 -{ usl - install_target = /usr/dt/share/backdrops/desc.de - type = sym_link -} -./de_DE.ISO8859-1 -{ usl - install_target = /usr/dt/share/examples/types/de - type = sym_link -} -#endif -#ifdef _SPANISH_ -./es_ES.ISO8859-1 -{ usl - install_target = /usr/dt/app-defaults/es - type = sym_link -} -./es_ES.ISO8859-1 -{ usl - install_target = /usr/dt/appconfig/appmanager/es - type = sym_link -} -./es_ES.ISO8859-1 -{ usl - install_target = /usr/dt/appconfig/types/es - type = sym_link -} -./es_ES.ISO8859-1 -{ usl - install_target = /usr/dt/config/es - type = sym_link -} -./desc.es_ES.ISO8859-1 -{ usl - install_target = /usr/dt/share/palettes/desc.es - type = sym_link -} -./desc.es_ES.ISO8859-1 -{ usl - install_target = /usr/dt/share/backdrops/desc.es - type = sym_link -} -./es_ES.ISO8859-1 -{ usl - install_target = /usr/dt/share/examples/types/es - type = sym_link -} -#endif -#ifdef _FRENCH_ -./fr_FR.ISO8859-1 -{ usl - install_target = /usr/dt/app-defaults/fr - type = sym_link -} -./fr_FR.ISO8859-1 -{ usl - install_target = /usr/dt/appconfig/appmanager/fr - type = sym_link -} -./fr_FR.ISO8859-1 -{ usl - install_target = /usr/dt/appconfig/types/fr - type = sym_link -} -./fr_FR.ISO8859-1 -{ usl - install_target = /usr/dt/config/fr - type = sym_link -} -./desc.fr_FR.ISO8859-1 -{ usl - install_target = /usr/dt/share/palettes/desc.fr - type = sym_link -} -./desc.fr_FR.ISO8859-1 -{ usl - install_target = /usr/dt/share/backdrops/desc.fr - type = sym_link -} -./fr_FR.ISO8859-1 -{ usl - install_target = /usr/dt/share/examples/types/fr - type = sym_link -} -#endif -#ifdef _ITALIAN_ -./it_IT.ISO8859-1 -{ usl - install_target = /usr/dt/app-defaults/it - type = sym_link -} -./it_IT.ISO8859-1 -{ usl - install_target = /usr/dt/appconfig/appmanager/it - type = sym_link -} -./it_IT.ISO8859-1 -{ usl - install_target = /usr/dt/appconfig/types/it - type = sym_link -} -./it_IT.ISO8859-1 -{ usl - install_target = /usr/dt/config/it - type = sym_link -} -./desc.it_IT.ISO8859-1 -{ usl - install_target = /usr/dt/share/palettes/desc.it - type = sym_link -} -./desc.it_IT.ISO8859-1 -{ usl - install_target = /usr/dt/share/backdrops/desc.it - type = sym_link -} -./it_IT.ISO8859-1 -{ usl - install_target = /usr/dt/share/examples/types/it - type = sym_link -} -#endif -#ifdef _JAPANESE_ -./ja_JP.dt-eucJP -{ usl - install_target = /usr/dt/app-defaults/ja - type = sym_link -} -./ja_JP.dt-eucJP -{ usl - install_target = /usr/dt/appconfig/appmanager/ja - type = sym_link -} -./ja_JP.dt-eucJP -{ usl - install_target = /usr/dt/appconfig/types/ja - type = sym_link -} -./ja_JP.dt-eucJP -{ usl - install_target = /usr/dt/config/ja - type = sym_link -} -./desc.ja_JP.dt-eucJP -{ usl - install_target = /usr/dt/share/palettes/desc.ja - type = sym_link -} -./desc.ja_JP.dt-eucJP -{ usl - install_target = /usr/dt/share/backdrops/desc.ja - type = sym_link -} -./ja_JP.dt-eucJP -{ usl - install_target = /usr/dt/share/examples/types/ja - type = sym_link -} -XCOMM -XCOMM dtimsstart configuration files -XCOMM -programs/dtimsstart/conf/hpux/ja_JP.eucJP -{ usl - install_target = /usr/dt/config/ims/ja -} -programs/dtimsstart/conf/hpux/xjim -{ usl - install_target = /usr/dt/config/ims/xjim -} -programs/dtimsstart/conf/hpux/atok8 -{ usl - install_target = /usr/dt/config/ims/atok8 -} -programs/dtimsstart/conf/hpux/vje -{ usl - install_target = /usr/dt/config/ims/vje -} -programs/dtimsstart/conf/hpux/egb -{ usl - install_target = /usr/dt/config/ims/egb -} -programs/dtimsstart/conf/hpux/builtin.jpn -{ usl - install_target = /usr/dt/config/ims/builtin.jpn -} -programs/dtimsstart/conf/hpux/none -{ usl - install_target = /usr/dt/config/ims/none -} -#endif -#ifdef _KOREAN_ -./ko_KR.dt-eucKR -{ usl - install_target = /usr/dt/app-defaults/ko - type = sym_link -} -./ko_KR.dt-eucKR -{ usl - install_target = /usr/dt/appconfig/appmanager/ko - type = sym_link -} -./ko_KR.dt-eucKR -{ usl - install_target = /usr/dt/appconfig/types/ko - type = sym_link -} -./ko_KR.dt-eucKR -{ usl - install_target = /usr/dt/config/ko - type = sym_link -} -./desc.ko_KR.dt-eucKR -{ usl - install_target = /usr/dt/share/palettes/desc.ko - type = sym_link -} -./desc.ko_KR.dt-eucKR -{ usl - install_target = /usr/dt/share/backdrops/desc.ko - type = sym_link -} -./ko_KR.dt-eucKR -{ usl - install_target = /usr/dt/share/examples/types/ko - type = sym_link -} -#endif -#ifdef _SWEDISH_ -./sv_SE.ISO8859-1 -{ usl - install_target = /usr/dt/app-defaults/sv - type = sym_link -} -./sv_SE.ISO8859-1 -{ usl - install_target = /usr/dt/appconfig/appmanager/sv - type = sym_link -} -./sv_SE.ISO8859-1 -{ usl - install_target = /usr/dt/appconfig/types/sv - type = sym_link -} -./sv_SE.ISO8859-1 -{ usl - install_target = /usr/dt/config/sv - type = sym_link -} -./desc.sv_SE.ISO8859-1 -{ usl - install_target = /usr/dt/share/palettes/desc.sv - type = sym_link -} -./desc.sv_SE.ISO8859-1 -{ usl - install_target = /usr/dt/share/backdrops/desc.sv - type = sym_link -} -./sv_SE.ISO8859-1 -{ usl - install_target = /usr/dt/share/examples/types/sv - type = sym_link -} -#endif -#ifdef _CHINESE_ -./zh_CN.dt-eucCN -{ usl - install_target = /usr/dt/app-defaults/zh_CN - type = sym_link -} -./zh_CN.dt-eucCN -{ usl - install_target = /usr/dt/appconfig/appmanager/zh_CN - type = sym_link -} -./zh_CN.dt-eucCN -{ usl - install_target = /usr/dt/appconfig/types/zh_CN - type = sym_link -} -./zh_CN.dt-eucCN -{ usl - install_target = /usr/dt/config/zh_CN - type = sym_link -} -./desc.zh_CN.dt-eucCN -{ usl - install_target = /usr/dt/share/palettes/desc.zh_CN - type = sym_link -} -./desc.zh_CN.dt-eucCN -{ usl - install_target = /usr/dt/share/backdrops/desc.zh_CN - type = sym_link -} -./zh_CN.dt-eucCN -{ usl - install_target = /usr/dt/share/examples/types/zh_CN - type = sym_link -} -#endif -#ifdef _TAIWANESE_ -./zh_TW.dt-eucTW -{ usl - install_target = /usr/dt/app-defaults/zh_TW - type = sym_link -} -./zh_TW.dt-eucTW -{ usl - install_target = /usr/dt/appconfig/appmanager/zh_TW - type = sym_link -} -./zh_TW.dt-eucTW -{ usl - install_target = /usr/dt/appconfig/types/zh_TW - type = sym_link -} -./zh_TW.dt-eucTW -{ usl - install_target = /usr/dt/config/zh_TW - type = sym_link -} -./desc.zh_TW.dt-eucTW -{ usl - install_target = /usr/dt/share/palettes/desc.zh_TW - type = sym_link -} -./desc.zh_TW.dt-eucTW -{ usl - install_target = /usr/dt/share/backdrops/desc.zh_TW - type = sym_link -} -./zh_TW.dt-eucTW -{ usl - install_target = /usr/dt/share/examples/types/zh_TW - type = sym_link -} -#endif -#endif /* USL */ - XCOMM ########################################################################## XCOMM XCOMM DEC - Locale and platform specific entries diff --git a/cde/databases/CDE-MAN-DEV.udb b/cde/databases/CDE-MAN-DEV.udb index 06c521dc..b461b831 100644 --- a/cde/databases/CDE-MAN-DEV.udb +++ b/cde/databases/CDE-MAN-DEV.udb @@ -111,28 +111,6 @@ responsible_project = cde_dt } -#>>------------------------------ -# Defaults for: UnixWare -#<<------------------------------ -# -{ usl : defaults - install_target = - fileset = CDE-MAN-DEV - type = file - status = di---- - processor = 378 - mode = 0444 - owner = bin - group = bin - link_source = - build_target = / - install_rule_name = - install_flags = - a_out_location = - order = 0 - responsible_project = cde_dt -} - #>>------------------------------ # Defaults for: standalone product #<<------------------------------ @@ -2889,7 +2867,3 @@ doc/C/man/man5/csacsa.5 install_target = /usr/dt/man type = sym_link } -{ usl - install_target = /usr/dt/man - type = sym_link -} diff --git a/cde/databases/CDE-MAN.udb b/cde/databases/CDE-MAN.udb index 2f6c43e5..134eddff 100644 --- a/cde/databases/CDE-MAN.udb +++ b/cde/databases/CDE-MAN.udb @@ -111,28 +111,6 @@ responsible_project = cde_dt } -#>>------------------------------ -# Defaults for: UnixWare -#<<------------------------------ -# -{ usl : defaults - install_target = - fileset = CDE-MAN - type = file - status = di---- - processor = 378 - mode = 0444 - owner = bin - group = bin - link_source = - build_target = / - install_rule_name = - install_flags = - a_out_location = - order = 0 - responsible_project = cde_dt -} - #>>------------------------------ # Defaults for: standalone product #<<------------------------------ @@ -852,10 +830,6 @@ doc/C/man/man6/ttsnoop.6 install_target = /usr/dt/man type = sym_link } -{ usl - install_target = /usr/dt/man - type = sym_link -} { freebsd install_target = /usr/dt/man type = sym_link diff --git a/cde/databases/CDE-MSG-LOC.src b/cde/databases/CDE-MSG-LOC.src index f85a55cd..d96ca8a9 100644 --- a/cde/databases/CDE-MSG-LOC.src +++ b/cde/databases/CDE-MSG-LOC.src @@ -535,77 +535,6 @@ XCOMM ########################################################################## #endif #endif /* _AIX */ -XCOMM ########################################################################## -XCOMM -XCOMM Novell - Locale and platform specific entries -XCOMM -XCOMM ########################################################################## -#ifdef USL -#ifdef _GERMAN_ -/usr/dt/lib/nls/msg/de_DE.ISO8859-1 -{ usl - install_target = /usr/dt/lib/nls/msg/de - type = sym_link -} -#endif -#ifdef _SPANISH_ -/usr/dt/lib/nls/msg/es_ES.ISO8859-1 -{ usl - install_target = /usr/dt/lib/nls/msg/es - type = sym_link -} -#endif -#ifdef _FRENCH_ -/usr/dt/lib/nls/msg/fr_FR.ISO8859-1 -{ usl - install_target = /usr/dt/lib/nls/msg/fr - type = sym_link -} -#endif -#ifdef _ITALIAN_ -/usr/dt/lib/nls/msg/it_IT.ISO8859-1 -{ usl - install_target = /usr/dt/lib/nls/msg/it - type = sym_link -} -#endif -#ifdef _JAPANESE_ -/usr/dt/lib/nls/msg/ja_JP.dt-eucJP -{ usl - install_target = /usr/dt/lib/nls/msg/ja - type = sym_link -} -#endif -#ifdef _KOREAN_ -/usr/dt/lib/nls/msg/ko_KR.dt-eucKR -{ usl - install_target = /usr/dt/lib/nls/msg/ko - type = sym_link -} -#endif -#ifdef _SWEDISH_ -/usr/dt/lib/nls/msg/sv_SE.ISO8859-1 -{ usl - install_target = /usr/dt/lib/nls/msg/sv - type = sym_link -} -#endif -#ifdef _CHINESE_ -/usr/dt/lib/nls/msg/zh_CN.dt-eucCN -{ usl - install_target = /usr/dt/lib/nls/msg/zh_CN - type = sym_link -} -#endif -#ifdef _TAIWANESE_ -/usr/dt/lib/nls/msg/zh_TW.dt-eucTW -{ usl - install_target = /usr/dt/lib/nls/msg/zh_TW - type = sym_link -} -#endif -#endif /* USL */ - XCOMM ########################################################################### XCOMM XCOMM DEC - Locale and platform specific entries diff --git a/cde/databases/CDE-RUN.udb b/cde/databases/CDE-RUN.udb index ceeb5584..ea936da6 100644 --- a/cde/databases/CDE-RUN.udb +++ b/cde/databases/CDE-RUN.udb @@ -1252,14 +1252,6 @@ programs/dtaction/dtaction } # programs/dtaction/dtaction -{ usl - install_target = /usr/dt/bin/dtaction - owner = root - group = sys - mode = 06555 -} -# -programs/dtaction/dtaction { dec install_target = /usr/dt/bin/dtaction owner = root diff --git a/cde/databases/CDE-SHLIBS.src b/cde/databases/CDE-SHLIBS.src index d8a344da..11d5898e 100644 --- a/cde/databases/CDE-SHLIBS.src +++ b/cde/databases/CDE-SHLIBS.src @@ -686,124 +686,6 @@ lib/DtMmdb/libDtMmdb.sl.2.1 mode = 0755 } XCOMM -XCOMM >>----------------------------- -XCOMM USL libraries -XCOMM <<----------------------------- -XCOMM -./libXm.so.2.1 -{ usl - install_target = /usr/dt/lib/libXm.so.1.2 - type = sym_link -} -XCOMM -./libMrm.so.2.1 -{ usl - install_target = /usr/dt/lib/libMrm.so.1.2 - type = sym_link -} -XCOMM -./libUil.so.2.1 -{ usl - install_target = /usr/dt/lib/libUil.so.1.2 - type = sym_link -} -XCOMM -lib/DtHelp/libDtHelp.so.2.1 -{ usl - install_target = /usr/dt/lib/libDtHelp.so.2.1 - mode = 0555 -} -XCOMM -./libDtHelp.so.2.1 -{ usl - install_target = /usr/dt/lib/libDtHelp.so.1 - type = sym_link -} -XCOMM -lib/DtPrint/libDtPrint.so.2.1 -{ usl - install_target = /usr/dt/lib/libDtPrint.so.2.1 - mode = 0555 -} -XCOMM -lib/DtMrm/libDtMrm.so.2.1 -{ usl - install_target = /usr/dt/lib/libDtMrm.so.2.1 - mode = 0555 -} -XCOMM -lib/DtSvc/libDtSvc.so.2.1 -{ usl - install_target = /usr/dt/lib/libDtSvc.so.2.1 - mode = 0555 -} -XCOMM -./libDtSvc.so.2.1 -{ usl - install_target = /usr/dt/lib/libDtSvc.so.1 - type = sym_link -} -XCOMM -lib/DtWidget/libDtWidget.so.2.1 -{ usl - install_target = /usr/dt/lib/libDtWidget.so.2.1 - mode = 0555 -} -XCOMM -./libDtWidget.so.2.1 -{ usl - install_target = /usr/dt/lib/libDtWidget.so.1 - type = sym_link -} -XCOMM -lib/DtTerm/libDtTerm.so.2.1 -{ usl - install_target = /usr/dt/lib/libDtTerm.so.2.1 - mode = 0555 -} -XCOMM -./libDtTerm.so.2.1 -{ usl - install_target = /usr/dt/lib/libDtTerm.so.1 - type = sym_link -} -XCOMM -lib/tt/lib/libtt.so.2.1 -{ usl - install_target = /usr/dt/lib/libtt.so.2.1 - mode = 0555 -} -XCOMM -./libtt.so.2.1 -{ usl - install_target = /usr/dt/lib/libtt.so.2 - type = sym_link -} -XCOMM -lib/csa/libcsa.so.2.1 -{ usl - install_target = /usr/dt/lib/libcsa.so.2.1 - mode = 0555 -} -XCOMM -./libcsa.so.2.1 -{ usl - install_target = /usr/dt/lib/libcsa.so.0 - type = sym_link -} -XCOMM -lib/DtSearch/libDtSearch.so.2.1 -{ usl - install_target = /usr/dt/lib/libDtSearch.so.2.1 - mode = 0555 -} -XCOMM -lib/DtMmdb/libDtMmdb.so.2.1 -{ usl - install_target = /usr/dt/lib/libDtMmdb.so.2.1 - mode = 0755 -} -XCOMM XCOMM XCOMM >>----------------------------- XCOMM DEC OSF/1 libraries diff --git a/cde/databases/CDE-TT.udb b/cde/databases/CDE-TT.udb index c9276433..7a0ef7fb 100644 --- a/cde/databases/CDE-TT.udb +++ b/cde/databases/CDE-TT.udb @@ -182,12 +182,6 @@ lib/tt/bin/ttdbserverd/rpc.ttdbserver type = sym_link } # -/usr/dt/bin/rpc.ttdbserver -{ usl - install_target = /usr/dt/bin/rpc.ttdbserverd - type = sym_link -} -# lib/tt/bin/tt_type_comp/tt_type_comp { default install_target = /usr/dt/bin/tt_type_comp diff --git a/cde/databases/Imakefile b/cde/databases/Imakefile index d07bb5a7..8d36cfb8 100644 --- a/cde/databases/Imakefile +++ b/cde/databases/Imakefile @@ -18,9 +18,6 @@ UDB_RELEASE_OPT = -ReleaseStream aix #ifdef AlphaArchitecture UDB_RELEASE_OPT = -ReleaseStream dec #endif -#ifdef USLArchitecture -UDB_RELEASE_OPT = -ReleaseStream usl -#endif #ifdef LinuxArchitecture UDB_RELEASE_OPT = -ReleaseStream linux #endif @@ -38,7 +35,7 @@ UDB_RELEASE_OPT = -ReleaseStream netbsd * Insure that symbols used in the .udb files are undefined for * pre-processing by cpp. */ -UDB_CPP_UNDEF_LIST = -UhpV4 -Uhpux -Uaix -Usun -Uusl -Udec -Uunix -Ulinux -Uopenbsd -Ufreebsd -Unetbsd +UDB_CPP_UNDEF_LIST = -UhpV4 -Uhpux -Uaix -Usun -Udec -Uunix -Ulinux -Uopenbsd -Ufreebsd -Unetbsd #define CreateLocalizedFilesets(Locale,Lang,readablename,runfs,helpfs,msgfs,AltLang,HelpLang,ResDB,HelpDB,MsgDB,InfoDB) @@\ diff --git a/cde/examples/dtaction/Makefile.novell b/cde/examples/dtaction/Makefile.novell deleted file mode 100644 index c6d70e11..00000000 --- a/cde/examples/dtaction/Makefile.novell +++ /dev/null @@ -1,45 +0,0 @@ -# $XConsortium: Makefile.novell /main/2 1996/05/13 11:42:53 drk $ -########################################################################## -# -# Makefile for dtdts examples (Novell) -# -# (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. -# -########################################################################## - -CC = cc -RM = rm -f - -PROGRAM = actions -SOURCES = actions.c -OBJECTS = actions.o - -DEFINES = -CDEBUGFLAGS = -O -CFLAGS = -Xc $(DEFINES) $(CDEBUGFLAGS) - -DTINCLUDE = -I/usr/dt/include -X11INCLUDE = -I/usr/X/include - -INCLUDES = $(DTINCLUDE) $(X11INCLUDE) - -DTLIBS = -L/usr/dt/lib -lDtSvc -lXm -X11LIBS = -L/usr/X/lib -lXt -lX11 -SYSLIBS = -lw -lgen -lnsl -lresolv -lsocket -lXIM - -LIBRARIES = $(DTLIBS) $(X11LIBS) $(SYSLIBS) -LDFLAGS = - -.c.o: - $(CC) -c $(CFLAGS) $(INCLUDES) $< - -all:: $(PROGRAM) - -$(PROGRAM):: $(OBJECTS) - $(CC) -o $(PROGRAM) $(LDFLAGS) $(OBJECTS) $(LIBRARIES) - -clean:: - $(RM) $(PROGRAM) $(OBJECTS) diff --git a/cde/examples/dtcalendar/Makefile.novell b/cde/examples/dtcalendar/Makefile.novell deleted file mode 100644 index b031836f..00000000 --- a/cde/examples/dtcalendar/Makefile.novell +++ /dev/null @@ -1,45 +0,0 @@ -# $XConsortium: Makefile.novell /main/2 1996/05/13 11:44:23 drk $ -########################################################################## -# -# Makefile for dtcalendar examples (Novell) -# -# (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. -# -########################################################################## - -CC = cc -RM = rm -f - -PROGRAM = attributes -SOURCES = attributes.c -OBJECTS = attributes.o - -DEFINES = -CDEBUGFLAGS = -O -CFLAGS = -Xc $(DEFINES) $(CDEBUGFLAGS) - -DTINCLUDE = -I/usr/dt/include -X11INCLUDE = - -INCLUDES = $(DTINCLUDE) $(X11INCLUDE) - -DTLIBS = -L/usr/dt/lib -lcsa -X11LIBS = -SYSLIBS = - -LIBRARIES = $(DTLIBS) $(X11LIBS) $(SYSLIBS) -LDFLAGS = -R/usr/dt/lib - -.c.o: - $(CC) -c $(CFLAGS) $(INCLUDES) $< - -all:: $(PROGRAM) - -$(PROGRAM):: $(OBJECTS) - $(CC) -o $(PROGRAM) $(LDFLAGS) $(OBJECTS) $(LIBRARIES) - -clean:: - $(RM) $(PROGRAM) $(OBJECTS) diff --git a/cde/examples/dtdnd/Makefile.usl b/cde/examples/dtdnd/Makefile.usl deleted file mode 100644 index 5dd96802..00000000 --- a/cde/examples/dtdnd/Makefile.usl +++ /dev/null @@ -1,45 +0,0 @@ -# $XConsortium: Makefile.usl /main/2 1996/05/13 11:46:28 drk $ -########################################################################## -# -# Makefile for dtdnddemo -# -# USL Platform -# -# (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 Unix System Labs, Inc., a subsidiary of -# Novell, Inc. -########################################################################## - -PROGRAM = dtdnddemo -SOURCES = demo.c icon.c text.c file.c buff.c -OBJECTS = demo.o icon.o text.o file.o buff.o -APPDEFAULTS = Dtdnddemo - -DEFINES = -CDEBUGFLAGS = -O -CFLAGS = -Xc $(DEFINES) $(CDEBUGFLAGS) - -DTINCLUDE = -I/usr/dt/include -X11INCLUDE = -I/usr/X/include - -INCLUDES = $(DTINCLUDE) $(X11INCLUDE) - -DTLIBS = -L/usr/dt/lib -lDtSvc -ltt -lXm -X11LIBS = -L/usr/X/lib -lXt -lX11 -SYSLIBS = -lw -lgen -lnsl -lresolv -lsocket -lXIM - -LIBRARIES = $(DTLIBS) $(X11LIBS) $(SYSLIBS) -LDFLAGS = - -.c.o: - ${CC} -c $(CFLAGS) $(INCLUDES) $< - -all:: $(PROGRAM) - -$(PROGRAM):: $(OBJECTS) $(APPDEFAULTS) - ${CC} -o $(PROGRAM) $(LDFLAGS) $(OBJECTS) $(LIBRARIES) - -clean:: - rm -f $(PROGRAM) $(OBJECTS) diff --git a/cde/examples/dtdts/Makefile.novell b/cde/examples/dtdts/Makefile.novell deleted file mode 100644 index e6442b98..00000000 --- a/cde/examples/dtdts/Makefile.novell +++ /dev/null @@ -1,45 +0,0 @@ -# $XConsortium: Makefile.novell /main/2 1996/05/13 11:47:37 drk $ -########################################################################## -# -# Makefile for dtdts examples (Novell) -# -# (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. -# -########################################################################## - -CC = cc -RM = rm -f - -PROGRAM = datatyping -SOURCES = datatyping.c -OBJECTS = datatyping.o - -DEFINES = -CDEBUGFLAGS = -O -CFLAGS = -Xc $(DEFINES) $(CDEBUGFLAGS) - -DTINCLUDE = -I/usr/dt/include -X11INCLUDE = -I/usr/X/include - -INCLUDES = $(DTINCLUDE) $(X11INCLUDE) - -DTLIBS = -L/usr/dt/lib -lDtSvc -lXm -X11LIBS = -L/usr/X/lib -lXt -lX11 -SYSLIBS = -lw -lgen -lnsl -lresolv -lsocket -lXIM - -LIBRARIES = $(DTLIBS) $(X11LIBS) $(SYSLIBS) -LDFLAGS = - -.c.o: - $(CC) -c $(CFLAGS) $(INCLUDES) $< - -all:: $(PROGRAM) - -$(PROGRAM):: $(OBJECTS) - $(CC) -o $(PROGRAM) $(LDFLAGS) $(OBJECTS) $(LIBRARIES) - -clean:: - $(RM) $(PROGRAM) $(OBJECTS) diff --git a/cde/examples/dtprint/Imakefile b/cde/examples/dtprint/Imakefile index 48102a84..0a7f8846 100644 --- a/cde/examples/dtprint/Imakefile +++ b/cde/examples/dtprint/Imakefile @@ -32,10 +32,6 @@ SYS_LIBRARIES = -lmsaa -liconv SYS_LIBRARIES = -lintl -L/opt/SUNWspro/SC2.0.1 -lm -lgen -ldl -lC #endif -#if defined (USLArchitecture) -SYS_LIBRARIES = -lm -lnsl -lsocket -lgen -#endif - #if defined(HPOSFArchitecture) #endif diff --git a/cde/examples/dtscreen/Makefile.novell b/cde/examples/dtscreen/Makefile.novell deleted file mode 100644 index 5af0cfe7..00000000 --- a/cde/examples/dtscreen/Makefile.novell +++ /dev/null @@ -1,45 +0,0 @@ -# $XConsortium: Makefile.novell /main/2 1996/05/13 11:48:47 drk $ -########################################################################## -# -# Makefile for dtsession examples (Novell) -# -# (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. -# -########################################################################## - -CC = cc -RM = rm -f - -PROGRAM = screensaver -SOURCES = screensaver.c -OBJECTS = screensaver.o - -DEFINES = -CDEBUGFLAGS = -O -CFLAGS = -Xc $(DEFINES) $(CDEBUGFLAGS) - -DTINCLUDE = -I/usr/dt/include -X11INCLUDE = -I/usr/X/include - -INCLUDES = $(DTINCLUDE) $(X11INCLUDE) - -DTLIBS = -L/usr/dt/lib -lDtSvc -X11LIBS = -L/usr/X/lib -lXt -lX11 -SYSLIBS = -lw -lgen -lnsl -lresolv -lsocket -lXIM -lm - -LIBRARIES = $(DTLIBS) $(X11LIBS) $(SYSLIBS) -LDFLAGS = - -.c.o: - $(CC) -c $(CFLAGS) $(INCLUDES) $< - -all:: $(PROGRAM) - -$(PROGRAM):: $(OBJECTS) - $(CC) -o $(PROGRAM) $(LDFLAGS) $(OBJECTS) $(LIBRARIES) - -clean:: - $(RM) $(PROGRAM) $(OBJECTS) diff --git a/cde/examples/dtsession/Makefile.novell b/cde/examples/dtsession/Makefile.novell deleted file mode 100644 index 65fdb1d8..00000000 --- a/cde/examples/dtsession/Makefile.novell +++ /dev/null @@ -1,45 +0,0 @@ -# $XConsortium: Makefile.novell /main/2 1996/05/13 11:50:10 drk $ -########################################################################## -# -# Makefile for dtsession examples (Novell) -# -# (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. -# -########################################################################## - -CC = cc -RM = rm -f - -PROGRAM = session -SOURCES = session.c -OBJECTS = session.o - -DEFINES = -CDEBUGFLAGS = -O -CFLAGS = -Xc $(DEFINES) $(CDEBUGFLAGS) - -DTINCLUDE = -I/usr/dt/include -X11INCLUDE = -I/usr/X/include - -INCLUDES = $(DTINCLUDE) $(X11INCLUDE) - -DTLIBS = -L/usr/dt/lib -lDtSvc -lXm -X11LIBS = -L/usr/X/lib -lXt -lX11 -SYSLIBS = -lw -lgen -lnsl -lresolv -lsocket -lXIM - -LIBRARIES = $(DTLIBS) $(X11LIBS) $(SYSLIBS) -LDFLAGS = - -.c.o: - $(CC) -c $(CFLAGS) $(INCLUDES) $< - -all:: $(PROGRAM) - -$(PROGRAM):: $(OBJECTS) - $(CC) -o $(PROGRAM) $(LDFLAGS) $(OBJECTS) $(LIBRARIES) - -clean:: - $(RM) $(PROGRAM) $(OBJECTS) diff --git a/cde/examples/dtterm/Makefile.novell b/cde/examples/dtterm/Makefile.novell deleted file mode 100644 index da2c0cbd..00000000 --- a/cde/examples/dtterm/Makefile.novell +++ /dev/null @@ -1,45 +0,0 @@ -# $XConsortium: Makefile.novell /main/2 1996/05/13 11:51:28 drk $ -########################################################################## -# -# Makefile for dtterm examples (Novell) -# -# (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. -# -########################################################################## - -CC = cc -RM = rm -f - -PROGRAM = term -SOURCES = term.c -OBJECTS = term.o - -DEFINES = -CDEBUGFLAGS = -O -CFLAGS = -Xc $(DEFINES) $(CDEBUGFLAGS) - -DTINCLUDE = -I/usr/dt/include -X11INCLUDE = -I/usr/X/include - -INCLUDES = $(DTINCLUDE) $(X11INCLUDE) - -DTLIBS = -L/usr/dt/lib -lDtTerm -lXm -X11LIBS = -L/usr/X/lib -lXt -lX11 -SYSLIBS = -lw -lgen -lnsl -lresolv -lsocket -lXIM - -LIBRARIES = $(DTLIBS) $(X11LIBS) $(SYSLIBS) -LDFLAGS = - -.c.o: - $(CC) -c $(CFLAGS) $(INCLUDES) $< - -all:: $(PROGRAM) - -$(PROGRAM):: $(OBJECTS) - $(CC) -o $(PROGRAM) $(LDFLAGS) $(OBJECTS) $(LIBRARIES) - -clean:: - $(RM) $(PROGRAM) $(OBJECTS) diff --git a/cde/examples/dtwidget/Makefile.novell b/cde/examples/dtwidget/Makefile.novell deleted file mode 100644 index d4436c27..00000000 --- a/cde/examples/dtwidget/Makefile.novell +++ /dev/null @@ -1,53 +0,0 @@ -# $XConsortium: Makefile.novell /main/2 1996/05/13 11:52:47 drk $ -########################################################################## -# -# Makefile for dtwidget examples (Novell) -# -# (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. -# -########################################################################## - -CC = cc -RM = rm -f - -PROGRAM1 = controls -SOURCES1 = controls.c -OBJECTS1 = controls.o - -PROGRAM2 = editor -SOURCES2 = editor.c -OBJECTS2 = editor.o - -DEFINES = -CDEBUGFLAGS = -O -CFLAGS = -Xc $(DEFINES) $(CDEBUGFLAGS) - -DTINCLUDE = -I/usr/dt/include -X11INCLUDE = -I/usr/X/include - -INCLUDES = $(DTINCLUDE) $(X11INCLUDE) - -DTLIBS = -L/usr/dt/lib -lDtWidget -lXm -X11LIBS = -L/usr/X/lib -lXt -lX11 -SYSLIBS = -lw -lgen -lnsl -lresolv -lsocket -lXIM - -LIBRARIES = $(DTLIBS) $(X11LIBS) $(SYSLIBS) -LDFLAGS = - -.c.o: - $(CC) -c $(CFLAGS) $(INCLUDES) $< - -all:: $(PROGRAM1) $(PROGRAM2) - -$(PROGRAM1):: $(OBJECTS1) - $(CC) -o $(PROGRAM1) $(LDFLAGS) $(OBJECTS1) $(LIBRARIES) - -$(PROGRAM2):: $(OBJECTS2) - $(CC) -o $(PROGRAM2) $(LDFLAGS) $(OBJECTS2) $(LIBRARIES) - -clean:: - $(RM) $(PROGRAM1) $(OBJECTS1) - $(RM) $(PROGRAM2) $(OBJECTS2) diff --git a/cde/examples/dtwsm/Makefile.novell b/cde/examples/dtwsm/Makefile.novell deleted file mode 100644 index 650bff47..00000000 --- a/cde/examples/dtwsm/Makefile.novell +++ /dev/null @@ -1,53 +0,0 @@ -# $XConsortium: Makefile.novell /main/2 1996/05/13 11:54:13 drk $ -########################################################################## -# -# Makefile for dtwidget examples (Novell) -# -# (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. -# -########################################################################## - -CC = cc -RM = rm -f - -PROGRAM1 = occupy -SOURCES1 = occupy.c -OBJECTS1 = occupy.o - -PROGRAM2 = wsinfo -SOURCES2 = wsinfo.c -OBJECTS2 = wsinfo.o - -DEFINES = -CDEBUGFLAGS = -O -CFLAGS = -Xc $(DEFINES) $(CDEBUGFLAGS) - -DTINCLUDE = -I/usr/dt/include -X11INCLUDE = -I/usr/X/include - -INCLUDES = $(DTINCLUDE) $(X11INCLUDE) - -DTLIBS = -L/usr/dt/lib -lDtSvc -lXm -X11LIBS = -L/usr/X/lib -lXt -lX11 -SYSLIBS = -lw -lgen -lnsl -lresolv -lsocket -lXIM - -LIBRARIES = $(DTLIBS) $(X11LIBS) $(SYSLIBS) -LDFLAGS = - -.c.o: - $(CC) -c $(CFLAGS) $(INCLUDES) $< - -all:: $(PROGRAM1) $(PROGRAM2) - -$(PROGRAM1):: $(OBJECTS1) - $(CC) -o $(PROGRAM1) $(LDFLAGS) $(OBJECTS1) $(LIBRARIES) - -$(PROGRAM2):: $(OBJECTS2) - $(CC) -o $(PROGRAM2) $(LDFLAGS) $(OBJECTS2) $(LIBRARIES) - -clean:: - $(RM) $(PROGRAM1) $(OBJECTS1) - $(RM) $(PROGRAM2) $(OBJECTS2) diff --git a/cde/examples/template/Makefile.novell b/cde/examples/template/Makefile.novell deleted file mode 100644 index deef4d50..00000000 --- a/cde/examples/template/Makefile.novell +++ /dev/null @@ -1,110 +0,0 @@ -# $XConsortium: Makefile.novell /main/3 1996/05/13 12:01:32 drk $ -########################################################################## -# -# Makefile for template example (Novell) -# -# (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. -# -########################################################################## - -CC = cc -RM = rm -f -DTHELPTAG = dthelptag -GENCAT = gencat -MKDIR = mkdir -p -CP = cp -CHMODEXE = chmod a+x - -LOCALE = C - -PACKAGE = template -APPGROUPNAME = template -PROGRAM = templatebin -SOURCES = template.c -OBJECTS = template.o -HELPSOURCE = $(LOCALE)/template.htg -HELPFILE = $(LOCALE)/template.sdl -MSGSOURCE = $(LOCALE)/template.msg -MSGFILE = $(LOCALE)/template.cat -TYPEFILE = $(LOCALE)/template.dt -ICONFILES = \ - $(LOCALE)/template.t.pm $(LOCALE)/template.t.bm \ - $(LOCALE)/template.s.pm $(LOCALE)/template.s.bm \ - $(LOCALE)/template.m.pm $(LOCALE)/template.m.bm \ - $(LOCALE)/template.l.pm $(LOCALE)/template.l.bm \ - $(LOCALE)/template_icon.pm $(LOCALE)/template_icon_m.bm \ - $(LOCALE)/template-brush.bm -APPDEFAULTSSRC = $(LOCALE)/Template.ad -APPDEFAULTS = $(LOCALE)/Template -README = $(LOCALE)/README -EXAMPLES = $(LOCALE)/example.template -ACTIONS = TemplateNew TemplateOpen TemplatePrint - -DEFINES = -CDEBUGFLAGS = -O -CFLAGS = -Xc $(DEFINES) $(CDEBUGFLAGS) - -DTINCLUDE = -I/usr/dt/include -X11INCLUDE = -I/usr/X/include - -INCLUDES = $(DTINCLUDE) $(X11INCLUDE) - -DTLIBS = -L/usr/dt/lib -lDtHelp -lDtSvc -lXm -ltt -X11LIBS = -L/usr/X/lib -lXt -lX11 -SYSLIBS = -lw -lgen -lnsl -lresolv -lsocket -lXIM - -LIBRARIES = $(DTLIBS) $(X11LIBS) $(SYSLIBS) -LDFLAGS = -R/usr/dt/lib:/usr/openwin/lib - -.c.o: - $(CC) -c $(CFLAGS) $(INCLUDES) $< - -#all:: $(PACKAGE) - -$(PACKAGE):: $(PROGRAM) $(HELPFILE) $(MSGFILE) $(APPDEFAULTS) \ - $(ICONFILES) $(TYPEFILE) $(README) $(EXAMPLES) $(ACTIONS) - - $(RM) -r $(PACKAGE) - - $(MKDIR) $(PACKAGE)/bin - $(MKDIR) $(PACKAGE)/app-defaults/C - $(MKDIR) $(PACKAGE)/msg/C - - $(CP) $(PROGRAM) $(PACKAGE)/bin - $(CP) $(MSGFILE) $(PACKAGE)/msg/C - $(CP) $(APPDEFAULTS) $(PACKAGE)/app-defaults/C - - $(MKDIR) $(PACKAGE)/dt/appconfig/icons/C - $(MKDIR) $(PACKAGE)/dt/appconfig/help/C - $(MKDIR) $(PACKAGE)/dt/appconfig/types/C - $(MKDIR) $(PACKAGE)/dt/appconfig/appmanager/$(LOCALE)/$(APPGROUPNAME) - - $(CP) $(ICONFILES) $(PACKAGE)/dt/appconfig/icons/C - $(CP) $(HELPFILE) $(PACKAGE)/dt/appconfig/help/C - $(CP) $(TYPEFILE) $(PACKAGE)/dt/appconfig/types/C - $(CP) $(README) $(EXAMPLES) $(ACTIONS) \ - $(PACKAGE)/dt/appconfig/appmanager/$(LOCALE)/$(APPGROUPNAME) - - $(CHMODEXE) $(ACTIONS) - $(CP) $(ACTIONS) \ - $(PACKAGE)/dt/appconfig/appmanager/$(LOCALE)/$(APPGROUPNAME) - -$(PROGRAM):: $(OBJECTS) - $(CC) -o $(PROGRAM) $(LDFLAGS) $(OBJECTS) $(LIBRARIES) - -$(APPDEFAULTS):: $(APPDEFAULTSSRC) - $(CP) $(APPDEFAULTSSRC) $(APPDEFAULTS) - -$(HELPFILE):: $(HELPSOURCE) - $(DTHELPTAG) $(HELPSOURCE) - -$(MSGFILE):: $(MSGSOURCE) - $(GENCAT) $(MSGFILE) $(MSGSOURCE) - -clean:: - $(RM) $(PROGRAM) $(OBJECTS) $(MSGFILE) $(APPDEFAULTS) - $(DTHELPTAG) -clean $(HELPSOURCE) - $(RM) -r template diff --git a/cde/examples/tt/Makefile.novell b/cde/examples/tt/Makefile.novell deleted file mode 100644 index c3bc202d..00000000 --- a/cde/examples/tt/Makefile.novell +++ /dev/null @@ -1,45 +0,0 @@ -# $XConsortium: Makefile.novell /main/2 1996/05/13 12:02:56 drk $ -########################################################################## -# -# Makefile for ToolTalk examples (Novell) -# -# (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. -# -########################################################################## - -CC = cc -RM = rm -f - -PROGRAM = broadcast -SOURCES = broadcast.c -OBJECTS = broadcast.o - -DEFINES = -CDEBUGFLAGS = -O -CFLAGS = -Xc $(DEFINES) $(CDEBUGFLAGS) - -DTINCLUDE = -I/usr/dt/include -X11INCLUDE = -I/usr/X/include - -INCLUDES = $(DTINCLUDE) $(X11INCLUDE) - -DTLIBS = -L/usr/dt/lib -ltt -lXm -X11LIBS = -L/usr/X/lib -lXt -lX11 -SYSLIBS = -lw -lgen -lnsl -lresolv -lsocket -lXIM - -LIBRARIES = $(DTLIBS) $(X11LIBS) $(SYSLIBS) -LDFLAGS = - -.c.o: - $(CC) -c $(CFLAGS) $(INCLUDES) $< - -all:: $(PROGRAM) - -$(PROGRAM):: $(OBJECTS) - $(CC) -o $(PROGRAM) $(LDFLAGS) $(OBJECTS) $(LIBRARIES) - -clean:: - $(RM) $(PROGRAM) $(OBJECTS) diff --git a/cde/historical/OPENBUGS b/cde/historical/OPENBUGS index 4d7de60f..8c7a6d54 100644 --- a/cde/historical/OPENBUGS +++ b/cde/historical/OPENBUGS @@ -1078,7 +1078,6 @@ CDExc23655 gencat is missing from the Linux distributio CDExc23657 Iconv does not exist on Linux. A suitable stubbing scheme is needed CDExc23669 Find a substitute for inline defines of __SVR4_I386_ABI_L1__ on linux CDExc23679 Need to clean up hacks in linux buil -CDExc23716 Build reports for SCO are showing false errors CDExc23887 shared library build on Solaris needs refinin CDExc23899 dtwm link line incorrect for Solari @@ -1098,7 +1097,6 @@ CDExc19393 If chown or chgrp fails during an install, the failure is mis-reporte CDExc20554 Various warnings/cleanups during installCD CDExc21373 During a DEC install some files that exist are reported missin CDExc21811 Sunsoft needs to provide configuration files for dtimsstart -CDExc21812 SCO needs to provide configuration files for dtimsstart CDExc22200 install set[gu]id non-readabl CDExc22543 system specific locale links should come from .lcx databas CDExc23116 install script sources users .cshr @@ -2660,7 +2658,6 @@ CDExc09189 TextF vts test FAILURES CDExc09190 CST vts FAILURES generated CDExc09762 WARNING in ComboBox widget tes CDExc19348 SpinBox VTS needs to be updated to reflect new implementation -CDExc19412 Callbacks failures in *Text* tests on UnixWare platform CDExc20152 ScaGtVal asks for two args, provides only on CDExc20153 vf/GetPixBD.c makes bad call to XCreateImag CDExc20154 vf/GetVis suffers from several problem diff --git a/cde/include/EUSCompat.h b/cde/include/EUSCompat.h index 73c72a6d..5d1c558b 100644 --- a/cde/include/EUSCompat.h +++ b/cde/include/EUSCompat.h @@ -59,7 +59,7 @@ extern "C" { ** System V R4 based systems define the stuff we need in ** sys/types.h. Include that and then we are done. */ -#if defined(HPUX) || defined(linux) || defined(SunOS) || defined(UNIX_SV) || defined(USL) +#if defined(HPUX) || defined(linux) || defined(SunOS) #include #endif @@ -162,16 +162,6 @@ typedef enum {B_FALSE, B_TRUE} boolean_t; #endif /* AIX */ -#if defined(USL) - -#include - -#define STRCASECMP_NOT_DEFINED -#if !defined(S_ISLNK) -#define S_ISLNK(mode) (((mode) & S_IFMT) == S_IFLNK) -#endif -#endif - /* * A bug in Solaris 2.1 and the GNU compilers, these are not defined. */ diff --git a/cde/lib/DtHelp/AIX.lcx b/cde/lib/DtHelp/AIX.lcx index 35a8b12d..009f96a0 100644 --- a/cde/lib/DtHelp/AIX.lcx +++ b/cde/lib/DtHelp/AIX.lcx @@ -211,61 +211,61 @@ vvvv! to CDE standard strings and back again. ! setlocales Compliance AIX.320+.setlocale.~.C.IBM-850: C ! setlocales compliance ,IBM AIX.320+.setlocale.~.POSIX.IBM-850: POSIX ! setlocales compliance ,IBM -AIX.410+.setlocale.~.C.ISO-8859-1: C ! setlocales compliance ,IBM, HP, Sun , USL -AIX.410+.setlocale.~.POSIX.ISO-8859-1: POSIX ! setlocales compliance ,IBM, HP, Sun , USL +AIX.410+.setlocale.~.C.ISO-8859-1: C ! setlocales compliance ,IBM, HP, Sun , +AIX.410+.setlocale.~.POSIX.ISO-8859-1: POSIX ! setlocales compliance ,IBM, HP, Sun , ! W European/Americas, Latin 1 codeset -AIX.320+.setlocale.~.da_DK.ISO-8859-1: da_DK !.ISO8859-1 ! Danish, Denmark XoJIG,IBM, HP, , USL ("da") -AIX.320+.setlocale.>.de_AT.ISO-8859-1: de_DE !.ISO8859-1 ! German,Austria XoJIG, , , , USL -AIX.320+.setlocale.~.de_CH.ISO-8859-1: de_CH !.ISO8859-1 ! German,Switzerland XoJIG,IBM, , , USL -AIX.320+.setlocale.~.de_DE.ISO-8859-1: de_DE !.ISO8859-1 ! German, Germany XoJIG,IBM, HP, Sun ("de"), USL ("de") -AIX.320+.setlocale.>.en_AU.ISO-8859-1: en_GB !.ISO8859-1 ! English,Australia , , , , USL -AIX.320+.setlocale.>.en_CA.ISO-8859-1: en_US !.ISO8859-1 ! English,Canada XoJIG, , , , USL -AIX.320+.setlocale.>.en_DK.ISO-8859-1: en_GB !.ISO8859-1 ! English, Denmark XoJIG, , , , USL -AIX.320+.setlocale.~.en_GB.ISO-8859-1: en_GB !.ISO8859-1 ! English, U.K. XoJIG,IBM, HP, , USL ("en") +AIX.320+.setlocale.~.da_DK.ISO-8859-1: da_DK !.ISO8859-1 ! Danish, Denmark XoJIG,IBM, HP, , +AIX.320+.setlocale.>.de_AT.ISO-8859-1: de_DE !.ISO8859-1 ! German,Austria XoJIG, , , , +AIX.320+.setlocale.~.de_CH.ISO-8859-1: de_CH !.ISO8859-1 ! German,Switzerland XoJIG,IBM, , , +AIX.320+.setlocale.~.de_DE.ISO-8859-1: de_DE !.ISO8859-1 ! German, Germany XoJIG,IBM, HP, Sun ("de"), +AIX.320+.setlocale.>.en_AU.ISO-8859-1: en_GB !.ISO8859-1 ! English,Australia , , , , +AIX.320+.setlocale.>.en_CA.ISO-8859-1: en_US !.ISO8859-1 ! English,Canada XoJIG, , , , +AIX.320+.setlocale.>.en_DK.ISO-8859-1: en_GB !.ISO8859-1 ! English, Denmark XoJIG, , , , +AIX.320+.setlocale.~.en_GB.ISO-8859-1: en_GB !.ISO8859-1 ! English, U.K. XoJIG,IBM, HP, , AIX.320+.setlocale.>.en_JP.ISO-8859-1: en_JP !.ISO8859-1 ! English, Japan XoJIG,IBM, , , AIX.410+.setlocale.>.en_JP.ISO-8859-1: en_US !.ISO8859-1 ! English, Japan XoJIG,IBM, , , -AIX.320+.setlocale.>.en_IE.ISO-8859-1: en_GB !.ISO8859-1 ! English, Ireland XoJIG, , , , USL -AIX.320+.setlocale.>.en_MY.ISO-8859-1: en_US !.ISO8859-1 ! English,Malaysia , , , , USL -AIX.320+.setlocale.>.en_NZ.ISO-8859-1: en_GB !.ISO8859-1 ! English,New Zealand , , , , USL -AIX.320+.setlocale.>.en_KR.ISO-8859-1: en_KR !.ISO8859-1 ! English,Korea , , , , USL +AIX.320+.setlocale.>.en_IE.ISO-8859-1: en_GB !.ISO8859-1 ! English, Ireland XoJIG, , , , +AIX.320+.setlocale.>.en_MY.ISO-8859-1: en_US !.ISO8859-1 ! English,Malaysia , , , , +AIX.320+.setlocale.>.en_NZ.ISO-8859-1: en_GB !.ISO8859-1 ! English,New Zealand , , , , +AIX.320+.setlocale.>.en_KR.ISO-8859-1: en_KR !.ISO8859-1 ! English,Korea , , , , AIX.410+.setlocale.>.en_KR.ISO-8859-1: en_US !.ISO8859-1 ! English,Korea ,IBM, , , -AIX.320+.setlocale.>.en_TW.ISO-8859-1: en_TW !.ISO8859-1 ! English,Taiwan , , , , USL +AIX.320+.setlocale.>.en_TW.ISO-8859-1: en_TW !.ISO8859-1 ! English,Taiwan , , , , AIX.410+.setlocale.>.en_TW.ISO-8859-1: en_US !.ISO8859-1 ! English,Taiwan ,IBM, , , -AIX.320+.setlocale.~.en_US.ISO-8859-1: en_US !.ISO8859-1 ! English, USA XoJIG,IBM, HP, Sun , USL -AIX.320+.setlocale.>.es_AR.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Argentina , , , Sun , USL +AIX.320+.setlocale.~.en_US.ISO-8859-1: en_US !.ISO8859-1 ! English, USA XoJIG,IBM, HP, Sun , +AIX.320+.setlocale.>.es_AR.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Argentina , , , Sun , AIX.320+.setlocale.>.es_BO.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Bolivia , , , Sun -AIX.320+.setlocale.>.es_CL.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Chile , , , Sun , USL +AIX.320+.setlocale.>.es_CL.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Chile , , , Sun , AIX.320+.setlocale.>.es_CO.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Columbia , , , Sun AIX.320+.setlocale.>.es_CR.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Costa Rica , , , Sun AIX.320+.setlocale.>.es_EC.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Ecuador , , , Sun -AIX.320+.setlocale.~.es_ES.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Spain XoJIG,IBM, HP, Sun , USL -AIX.410+.setlocale.~.ca_ES.ISO-8859-1: ca_ES !.ISO8859-1 ! Catalan, Spain XoJIG,IBM, HP, Sun , USL +AIX.320+.setlocale.~.es_ES.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Spain XoJIG,IBM, HP, Sun , +AIX.410+.setlocale.~.ca_ES.ISO-8859-1: ca_ES !.ISO8859-1 ! Catalan, Spain XoJIG,IBM, HP, Sun , AIX.320+.setlocale.>.es_GT.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Guatemala , , , Sun -AIX.320+.setlocale.>.es_MX.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Mexico , , , Sun , USL +AIX.320+.setlocale.>.es_MX.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Mexico , , , Sun , AIX.320+.setlocale.>.es_PE.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Peru , , , Sun AIX.320+.setlocale.>.es_UY.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Uruguay , , , Sun -AIX.320+.setlocale.>.es_VE.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Venezuela , , , Sun , USL +AIX.320+.setlocale.>.es_VE.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Venezuela , , , Sun , ! AIX.320+.setlocale.>.et_EE.ISO-8859-1: ! Estonian, Estonia XoJIG, -AIX.320+.setlocale.~.fi_FI.ISO-8859-1: fi_FI !.ISO8859-1 ! Finnish, Finland XoJIG,IBM, HP, , USL ("fi") +AIX.320+.setlocale.~.fi_FI.ISO-8859-1: fi_FI !.ISO8859-1 ! Finnish, Finland XoJIG,IBM, HP, , ! AIX.320+.setlocale.>.fo_FO.ISO-8859-1: ! Faroese, Faeroe Island XoJIG, -AIX.320+.setlocale.~.fr_BE.ISO-8859-1: fr_BE !.ISO8859-1 ! French,Belgium XoJIG, , , , USL -AIX.320+.setlocale.~.fr_CA.ISO-8859-1: fr_CA !.ISO8859-1 ! French, Canada XoJIG,IBM, HP, , USL -AIX.320+.setlocale.~.fr_CH.ISO-8859-1: fr_CH !.ISO8859-1 ! French, Switzerland XoJIG,IBM, , , USL -AIX.320+.setlocale.~.fr_FR.ISO-8859-1: fr_FR !.ISO8859-1 ! French, France XoJIG,IBM, HP, Sun ("fr"), USL ("fr") -AIX.320+.setlocale.~.is_IS.ISO-8859-1: is_IS !.ISO8859-1 ! Icelandic, Iceland XoJIG,IBM, HP, , USL ("is") -AIX.320+.setlocale.>.it_CH.ISO-8859-1: it_IT !.ISO8859-1 ! Italian,Switzerland , , , , USL -AIX.320+.setlocale.~.it_IT.ISO-8859-1: it_IT !.ISO8859-1 ! Italian, Italy XoJIG,IBM, HP, Sun ("it"), USL ("it") +AIX.320+.setlocale.~.fr_BE.ISO-8859-1: fr_BE !.ISO8859-1 ! French,Belgium XoJIG, , , , +AIX.320+.setlocale.~.fr_CA.ISO-8859-1: fr_CA !.ISO8859-1 ! French, Canada XoJIG,IBM, HP, , +AIX.320+.setlocale.~.fr_CH.ISO-8859-1: fr_CH !.ISO8859-1 ! French, Switzerland XoJIG,IBM, , , +AIX.320+.setlocale.~.fr_FR.ISO-8859-1: fr_FR !.ISO8859-1 ! French, France XoJIG,IBM, HP, Sun ("fr"), +AIX.320+.setlocale.~.is_IS.ISO-8859-1: is_IS !.ISO8859-1 ! Icelandic, Iceland XoJIG,IBM, HP, , +AIX.320+.setlocale.>.it_CH.ISO-8859-1: it_IT !.ISO8859-1 ! Italian,Switzerland , , , , +AIX.320+.setlocale.~.it_IT.ISO-8859-1: it_IT !.ISO8859-1 ! Italian, Italy XoJIG,IBM, HP, Sun ("it"), ! AIX.320+.setlocale.>.kl_GL.ISO-8859-1: ! Greenlandic, Greenland XoJIG, ! AIX.320+.setlocale.>.lt_LT.ISO-8859-1: ! Lithuanian, Lithuania XoJIG, ! AIX.320+.setlocale.>.lv_LV.ISO-8859-1: ! Latvian, Latvia XoJIG, -AIX.320+.setlocale.~.nl_BE.ISO-8859-1: nl_BE !.ISO8859-1 ! Dutch, Belgium XoJIG,IBM, , , USL -AIX.320+.setlocale.~.nl_NL.ISO-8859-1: nl_NL !.ISO8859-1 ! Dutch, The Netherlands XoJIG,IBM, HP, , USL ("nl") -AIX.320+.setlocale.~.no_NO.ISO-8859-1: no_NO !.ISO8859-1 ! Norwegian, Norway XoJIG,IBM, HP, , USL ("no") -AIX.410+.setlocale.~.pt_BR.ISO-8859-1: pt_BR !.ISO8859-1 ! Portuguese,Brazil , , , , USL -AIX.320+.setlocale.~.pt_PT.ISO-8859-1: pt_PT !.ISO8859-1 ! Portuguese, Portugal XoJIG,IBM, HP, , USL +AIX.320+.setlocale.~.nl_BE.ISO-8859-1: nl_BE !.ISO8859-1 ! Dutch, Belgium XoJIG,IBM, , , +AIX.320+.setlocale.~.nl_NL.ISO-8859-1: nl_NL !.ISO8859-1 ! Dutch, The Netherlands XoJIG,IBM, HP, , +AIX.320+.setlocale.~.no_NO.ISO-8859-1: no_NO !.ISO8859-1 ! Norwegian, Norway XoJIG,IBM, HP, , +AIX.410+.setlocale.~.pt_BR.ISO-8859-1: pt_BR !.ISO8859-1 ! Portuguese,Brazil , , , , +AIX.320+.setlocale.~.pt_PT.ISO-8859-1: pt_PT !.ISO8859-1 ! Portuguese, Portugal XoJIG,IBM, HP, , AIX.320+.setlocale.>.sv_FI.ISO-8859-1: sv_SE !.ISO8859-1 ! Swedish, Finland XoJIG, -AIX.320+.setlocale.~.sv_SE.ISO-8859-1: sv_SE !.ISO8859-1 ! Swedish, Sweden XoJIG,IBM, HP, Sun ("sv"), USL ("sv") +AIX.320+.setlocale.~.sv_SE.ISO-8859-1: sv_SE !.ISO8859-1 ! Swedish, Sweden XoJIG,IBM, HP, Sun ("sv"), ! E European @@ -302,14 +302,14 @@ AIX.320+.setlocale.~.el_GR.ISO-8859-7: el_GR !.ISO8859-7 ! Greek, Greece AIX.320+.setlocale.~.tr_TR.ISO-8859-9: tr_TR !.ISO8859-9 ! Turkish, Turkey ,IBM, HP ! East Asia -AIX.320+.setlocale.~.ja_JP.EUC-JP: ja_JP !.IBM-eucJP ! Japanese, Japan ,IBM, HP, Sun ("ja"), USL +AIX.320+.setlocale.~.ja_JP.EUC-JP: ja_JP !.IBM-eucJP ! Japanese, Japan ,IBM, HP, Sun ("ja"), AIX.320+.setlocale.~.ja_JP.IBM-932: Ja_JP !.IBM-932 ! Japanese, Japan ,IBM AIX.320+.setlocale.>.ja_JP.HP-SJIS: Ja_JP !.IBM-932 ! Japanese, Japan aka japanese 15 , , HP, -AIX.320+.setlocale.~.ko_KR.EUC-KR: ko_KR !.IBM-eucKR ! Korean, Korea ,IBM, HP, Sun ("ko"), USL -AIX.320+.setlocale.~.zh_CN.EUC-CN: zh_CN !.IBM-eucCN ! Chinese, China ,IBM, , Sun ("zh"), USL +AIX.320+.setlocale.~.ko_KR.EUC-KR: ko_KR !.IBM-eucKR ! Korean, Korea ,IBM, HP, Sun ("ko"), +AIX.320+.setlocale.~.zh_CN.EUC-CN: zh_CN !.IBM-eucCN ! Chinese, China ,IBM, , Sun ("zh"), AIX.320+.setlocale.>.zh_CN.HP-15CN: zh_CN !.IBM-eucCN ! Chinese, China , , HP AIX.320+.setlocale.~.zh_CN.UTF-8: ZH_CN !.UTF-8 ! Chinese, China ,IBM, -AIX.320+.setlocale.~.zh_TW.EUC-TW: zh_TW !.IBM-eucTW ! Chinese, Taiwan ,IBM, HP, Sun , USL +AIX.320+.setlocale.~.zh_TW.EUC-TW: zh_TW !.IBM-eucTW ! Chinese, Taiwan ,IBM, HP, Sun , AIX.320+.setlocale.>.zh_TW.HP-BIG5: Zh_TW !.big5 ! Chinese, Taiwan ,IBM, HP, , ! AIX.320+.setlocale.>.zh_TW.HP-CCDC: ! Chinese, Taiwan , , HP, , ! AIX.320+.setlocale.>.ja_JP.HP-KANA8: ! Japanese, Japan , , HP, , diff --git a/cde/lib/DtHelp/CDE.lcx b/cde/lib/DtHelp/CDE.lcx index 68473c56..96eaef6c 100644 --- a/cde/lib/DtHelp/CDE.lcx +++ b/cde/lib/DtHelp/CDE.lcx @@ -257,57 +257,57 @@ CDE.?.version.<.100: ".*" !! any CDE value ! ---- - --------- ! Standards Compliance, Latin 1 codeset -CDE.100+.standard.=.C.ISO-8859-1: C.ISO-8859-1 ! Standards compliance ,IBM, HP, Sun , USL -CDE.100+.standard.=.POSIX.ISO-8859-1: POSIX.ISO-8859-1 ! Standards compliance ,IBM, HP, Sun , USL +CDE.100+.standard.=.C.ISO-8859-1: C.ISO-8859-1 ! Standards compliance ,IBM, HP, Sun , +CDE.100+.standard.=.POSIX.ISO-8859-1: POSIX.ISO-8859-1 ! Standards compliance ,IBM, HP, Sun , ! W European/Americas, Latin 1 codeset -CDE.100+.standard.=.da_DK.ISO-8859-1: da_DK.ISO-8859-1 ! Danish, Denmark XoJIG,IBM, HP, , USL ("da") -CDE.100+.standard.=.de_AT.ISO-8859-1: de_AT.ISO-8859-1 ! German,Austria XoJIG, , , , USL -CDE.100+.standard.=.de_CH.ISO-8859-1: de_CH.ISO-8859-1 ! German,Switzerland XoJIG,IBM, , , USL -CDE.100+.standard.=.de_DE.ISO-8859-1: de_DE.ISO-8859-1 ! German, Germany XoJIG,IBM, HP, Sun ("de"), USL ("de") -CDE.100+.standard.=.en_AU.ISO-8859-1: en_AU.ISO-8859-1 ! English,Australia , , , , USL -CDE.100+.standard.=.en_CA.ISO-8859-1: en_CA.ISO-8859-1 ! English,Canada XoJIG, , , , USL -CDE.100+.standard.=.en_DK.ISO-8859-1: en_DK.ISO-8859-1 ! English, Denmark XoJIG, , , , USL -CDE.100+.standard.=.en_GB.ISO-8859-1: en_GB.ISO-8859-1 ! English, U.K. XoJIG,IBM, HP, , USL ("en") +CDE.100+.standard.=.da_DK.ISO-8859-1: da_DK.ISO-8859-1 ! Danish, Denmark XoJIG,IBM, HP, , +CDE.100+.standard.=.de_AT.ISO-8859-1: de_AT.ISO-8859-1 ! German,Austria XoJIG, , , , +CDE.100+.standard.=.de_CH.ISO-8859-1: de_CH.ISO-8859-1 ! German,Switzerland XoJIG,IBM, , , +CDE.100+.standard.=.de_DE.ISO-8859-1: de_DE.ISO-8859-1 ! German, Germany XoJIG,IBM, HP, Sun ("de"), +CDE.100+.standard.=.en_AU.ISO-8859-1: en_AU.ISO-8859-1 ! English,Australia , , , , +CDE.100+.standard.=.en_CA.ISO-8859-1: en_CA.ISO-8859-1 ! English,Canada XoJIG, , , , +CDE.100+.standard.=.en_DK.ISO-8859-1: en_DK.ISO-8859-1 ! English, Denmark XoJIG, , , , +CDE.100+.standard.=.en_GB.ISO-8859-1: en_GB.ISO-8859-1 ! English, U.K. XoJIG,IBM, HP, , CDE.100+.standard.=.en_JP.ISO-8859-1: en_JP.ISO-8859-1 ! English, Japan XoJIG,IBM, , , -CDE.100+.standard.=.en_IE.ISO-8859-1: en_IE.ISO-8859-1 ! English, Ireland XoJIG, , , , USL +CDE.100+.standard.=.en_IE.ISO-8859-1: en_IE.ISO-8859-1 ! English, Ireland XoJIG, , , , CDE.100+.standard.=.en_KR.ISO-8859-1: en_KR.ISO-8859-1 ! English, Korea XoJIG,IBM, , , -CDE.100+.standard.=.en_MY.ISO-8859-1: en_MY.ISO-8859-1 ! English,Malaysia , , , , USL -CDE.100+.standard.=.en_NZ.ISO-8859-1: en_NZ.ISO-8859-1 ! English,New Zealand , , , , USL +CDE.100+.standard.=.en_MY.ISO-8859-1: en_MY.ISO-8859-1 ! English,Malaysia , , , , +CDE.100+.standard.=.en_NZ.ISO-8859-1: en_NZ.ISO-8859-1 ! English,New Zealand , , , , CDE.100+.standard.=.en_TW.ISO-8859-1: en_TW.ISO-8859-1 ! English, Taiwan XoJIG,IBM, , , -CDE.100+.standard.=.en_US.ISO-8859-1: en_US.ISO-8859-1 ! English, USA XoJIG,IBM, HP, Sun , USL -CDE.100+.standard.=.es_AR.ISO-8859-1: es_AR.ISO-8859-1 ! Spanish, Argentina , , , Sun , USL +CDE.100+.standard.=.en_US.ISO-8859-1: en_US.ISO-8859-1 ! English, USA XoJIG,IBM, HP, Sun , +CDE.100+.standard.=.es_AR.ISO-8859-1: es_AR.ISO-8859-1 ! Spanish, Argentina , , , Sun , CDE.100+.standard.=.es_BO.ISO-8859-1: es_BO.ISO-8859-1 ! Spanish, Bolivia , , , Sun -CDE.100+.standard.=.es_CL.ISO-8859-1: es_CL.ISO-8859-1 ! Spanish, Chile , , , Sun , USL +CDE.100+.standard.=.es_CL.ISO-8859-1: es_CL.ISO-8859-1 ! Spanish, Chile , , , Sun , CDE.100+.standard.=.es_CO.ISO-8859-1: es_CO.ISO-8859-1 ! Spanish, Columbia , , , Sun CDE.100+.standard.=.es_CR.ISO-8859-1: es_CR.ISO-8859-1 ! Spanish, Costa Rica , , , Sun CDE.100+.standard.=.es_EC.ISO-8859-1: es_EC.ISO-8859-1 ! Spanish, Ecuador , , , Sun -CDE.100+.standard.=.es_ES.ISO-8859-1: es_ES.ISO-8859-1 ! Spanish, Spain XoJIG,IBM, HP, Sun , USL +CDE.100+.standard.=.es_ES.ISO-8859-1: es_ES.ISO-8859-1 ! Spanish, Spain XoJIG,IBM, HP, Sun , CDE.100+.standard.=.es_GT.ISO-8859-1: es_GT.ISO-8859-1 ! Spanish, Guatemala , , , Sun -CDE.100+.standard.=.es_MX.ISO-8859-1: es_MX.ISO-8859-1 ! Spanish, Mexico , , , Sun , USL +CDE.100+.standard.=.es_MX.ISO-8859-1: es_MX.ISO-8859-1 ! Spanish, Mexico , , , Sun , CDE.100+.standard.=.es_PE.ISO-8859-1: es_PE.ISO-8859-1 ! Spanish, Peru , , , Sun CDE.100+.standard.=.es_UY.ISO-8859-1: es_UY.ISO-8859-1 ! Spanish, Uruguay , , , Sun -CDE.100+.standard.=.es_VE.ISO-8859-1: es_VE.ISO-8859-1 ! Spanish, Venezuela , , , Sun , USL +CDE.100+.standard.=.es_VE.ISO-8859-1: es_VE.ISO-8859-1 ! Spanish, Venezuela , , , Sun , CDE.100+.standard.=.et_EE.ISO-8859-1: et_EE.ISO-8859-1 ! Estonian, Estonia XoJIG, -CDE.100+.standard.=.fi_FI.ISO-8859-1: fi_FI.ISO-8859-1 ! Finnish, Finland XoJIG,IBM, HP, , USL ("fi") +CDE.100+.standard.=.fi_FI.ISO-8859-1: fi_FI.ISO-8859-1 ! Finnish, Finland XoJIG,IBM, HP, , CDE.100+.standard.=.fo_FO.ISO-8859-1: fo_FO.ISO-8859-1 ! Faroese, Faeroe Island XoJIG, -CDE.100+.standard.=.fr_BE.ISO-8859-1: fr_BE.ISO-8859-1 ! French,Belgium XoJIG, , , , USL -CDE.100+.standard.=.fr_CA.ISO-8859-1: fr_CA.ISO-8859-1 ! French, Canada XoJIG,IBM, HP, , USL -CDE.100+.standard.=.fr_CH.ISO-8859-1: fr_CH.ISO-8859-1 ! French, Switzerland XoJIG,IBM, , , USL -CDE.100+.standard.=.fr_FR.ISO-8859-1: fr_FR.ISO-8859-1 ! French, France XoJIG,IBM, HP, Sun ("fr"), USL ("fr") -CDE.100+.standard.=.is_IS.ISO-8859-1: is_IS.ISO-8859-1 ! Icelandic, Iceland XoJIG,IBM, HP, , USL ("is") -CDE.100+.standard.=.it_CH.ISO-8859-1: it_CH.ISO-8859-1 ! Italian,Switzerland , , , , USL -CDE.100+.standard.=.it_IT.ISO-8859-1: it_IT.ISO-8859-1 ! Italian, Italy XoJIG,IBM, HP, Sun ("it"), USL ("it") +CDE.100+.standard.=.fr_BE.ISO-8859-1: fr_BE.ISO-8859-1 ! French,Belgium XoJIG, , , , +CDE.100+.standard.=.fr_CA.ISO-8859-1: fr_CA.ISO-8859-1 ! French, Canada XoJIG,IBM, HP, , +CDE.100+.standard.=.fr_CH.ISO-8859-1: fr_CH.ISO-8859-1 ! French, Switzerland XoJIG,IBM, , , +CDE.100+.standard.=.fr_FR.ISO-8859-1: fr_FR.ISO-8859-1 ! French, France XoJIG,IBM, HP, Sun ("fr"), +CDE.100+.standard.=.is_IS.ISO-8859-1: is_IS.ISO-8859-1 ! Icelandic, Iceland XoJIG,IBM, HP, , +CDE.100+.standard.=.it_CH.ISO-8859-1: it_CH.ISO-8859-1 ! Italian,Switzerland , , , , +CDE.100+.standard.=.it_IT.ISO-8859-1: it_IT.ISO-8859-1 ! Italian, Italy XoJIG,IBM, HP, Sun ("it"), CDE.100+.standard.=.kl_GL.ISO-8859-1: kl_GL.ISO-8859-1 ! Greenlandic, Greenland XoJIG, CDE.100+.standard.=.lt_LT.ISO-8859-1: lt_LT.ISO-8859-1 ! Lithuanian, Lithuania XoJIG, CDE.100+.standard.=.lv_LV.ISO-8859-1: lv_LV.ISO-8859-1 ! Latvian, Latvia XoJIG, -CDE.100+.standard.=.nl_BE.ISO-8859-1: nl_BE.ISO-8859-1 ! Dutch, Belgium XoJIG,IBM, , , USL -CDE.100+.standard.=.nl_NL.ISO-8859-1: nl_NL.ISO-8859-1 ! Dutch, The Netherlands XoJIG,IBM, HP, , USL ("nl") -CDE.100+.standard.=.no_NO.ISO-8859-1: no_NO.ISO-8859-1 ! Norwegian, Norway XoJIG,IBM, HP, , USL ("no") -CDE.100+.standard.=.pt_BR.ISO-8859-1: pt_BR.ISO-8859-1 ! Portuguese,Brazil , , , , USL -CDE.100+.standard.=.pt_PT.ISO-8859-1: pt_PT.ISO-8859-1 ! Portuguese, Portugal XoJIG,IBM, HP, , USL +CDE.100+.standard.=.nl_BE.ISO-8859-1: nl_BE.ISO-8859-1 ! Dutch, Belgium XoJIG,IBM, , , +CDE.100+.standard.=.nl_NL.ISO-8859-1: nl_NL.ISO-8859-1 ! Dutch, The Netherlands XoJIG,IBM, HP, , +CDE.100+.standard.=.no_NO.ISO-8859-1: no_NO.ISO-8859-1 ! Norwegian, Norway XoJIG,IBM, HP, , +CDE.100+.standard.=.pt_BR.ISO-8859-1: pt_BR.ISO-8859-1 ! Portuguese,Brazil , , , , +CDE.100+.standard.=.pt_PT.ISO-8859-1: pt_PT.ISO-8859-1 ! Portuguese, Portugal XoJIG,IBM, HP, , CDE.100+.standard.=.sv_FI.ISO-8859-1: sv_FI.ISO-8859-1 ! Swedish, Finland XoJIG, -CDE.100+.standard.=.sv_SE.ISO-8859-1: sv_SE.ISO-8859-1 ! Swedish, Sweden XoJIG,IBM, HP, Sun ("sv"), USL ("sv") +CDE.100+.standard.=.sv_SE.ISO-8859-1: sv_SE.ISO-8859-1 ! Swedish, Sweden XoJIG,IBM, HP, Sun ("sv"), ! Standards Compliance, HP-ROMAN8 codeset CDE.100+.standard.=.C.HP-ROMAN8: C.HP-ROMAN8 ! Standards compliance , , HP, @@ -457,18 +457,18 @@ CDE.100+.standard.=.tr_TR.ISO-8859-9: tr_TR.ISO-8859-9 ! Turkish, Turkey CDE.100+.standard.=.tr_TR.HP-TURKISH8: tr_TR.HP-TURKISH8 ! Turkish, Turkey , , HP ! East Asia -CDE.100+.standard.=.ja_JP.EUC-JP: ja_JP.EUC-JP ! Japanese, Japan ,IBM, HP, Sun ("ja"), USL +CDE.100+.standard.=.ja_JP.EUC-JP: ja_JP.EUC-JP ! Japanese, Japan ,IBM, HP, Sun ("ja"), CDE.100+.standard.=.ja_JP.ISO-2022-JP: ja_JP.ISO-2022-JP ! Japanese, Japan ,IBM, HP, SUN , ??? CDE.100+.standard.=.ja_JP.IBM-932: ja_JP.IBM-932 ! Japanese, Japan ,IBM, CDE.100+.standard.=.ja_JP.HP-SJIS: ja_JP.HP-SJIS ! Japanese, Japan , , HP, , CDE.100+.standard.=.ja_JP.HP-KANA8: ja_JP.HP-KANA8 ! Japanese, Japan , , HP, , -CDE.100+.standard.=.ko_KR.EUC-KR: ko_KR.EUC-KR ! Korean, Korea ,IBM, HP, Sun ("ko"), USL +CDE.100+.standard.=.ko_KR.EUC-KR: ko_KR.EUC-KR ! Korean, Korea ,IBM, HP, Sun ("ko"), CDE.100+.standard.=.ko_KR.ISO-2022-KR: ko_KR.ISO-2022-KR ! Korean, Korea ,???, ??, SUN , ??? -CDE.100+.standard.=.zh_CN.EUC-CN: zh_CN.EUC-CN ! Chinese, China ,IBM, HP, Sun ("zh"), USL +CDE.100+.standard.=.zh_CN.EUC-CN: zh_CN.EUC-CN ! Chinese, China ,IBM, HP, Sun ("zh"), CDE.100+.standard.=.zh_CN.UTF-8: zh_CN.UTF-8 ! Chinese, China ,IBM, , , CDE.100+.standard.=.zh_CN.ISO-2022-CN: zh_CN.ISO-2022-CN ! Chinese, China ,IBM, ??, SUN , ??? CDE.100+.standard.=.zh_CN.HP-15CN: zh_CN.HP-15CN ! Chinese, China , , HP -CDE.100+.standard.=.zh_TW.EUC-TW: zh_TW.EUC-TW ! Chinese, Taiwan ,IBM, HP, Sun , USL +CDE.100+.standard.=.zh_TW.EUC-TW: zh_TW.EUC-TW ! Chinese, Taiwan ,IBM, HP, Sun , CDE.100+.standard.=.zh_TW.ISO-2022-TW: zh_TW.ISO-2022-TW ! Chinese, Taiwan ,IBM, ??, SUN , ??? CDE.100+.standard.=.zh_TW.HP-BIG5: zh_TW.HP-BIG5 ! Chinese, Taiwan , , HP, , CDE.100+.standard.=.zh_TW.HP-CCDC: zh_TW.HP-CCDC ! Chinese, Taiwan , , HP, , diff --git a/cde/lib/DtHelp/CanvasP.h b/cde/lib/DtHelp/CanvasP.h index c25d0c29..ed20c24a 100644 --- a/cde/lib/DtHelp/CanvasP.h +++ b/cde/lib/DtHelp/CanvasP.h @@ -49,13 +49,13 @@ extern "C" { #endif /******** Public Re-defines ********/ -#if !defined(_AIX) && !defined(USL) +#if !defined(_AIX) #define _DtCvStrCaseCmp(s1,s2) strcasecmp(s1,s2) #define _DtCvStrNCaseCmp(s1,s2, n) strncasecmp(s1,s2,n) #else #define _DtCvStrCaseCmp(s1,s2) _DtHelpCeStrCaseCmp(s1,s2) #define _DtCvStrNCaseCmp(s1,s2,n) _DtHelpCeStrNCaseCmp(s1,s2, n) -#endif /* _AIX or USL */ +#endif /* _AIX */ /******** Public Defines Declarations ********/ /* diff --git a/cde/lib/DtHelp/CvString.c b/cde/lib/DtHelp/CvString.c index d44301fc..fe274730 100644 --- a/cde/lib/DtHelp/CvString.c +++ b/cde/lib/DtHelp/CvString.c @@ -355,7 +355,7 @@ _DtCvFreeArray (void **array) return (0); } -#if defined(_AIX) || defined (USL) +#if defined(_AIX) /***************************************************************************** * Function: _DtCvStrCaseCmp * @@ -363,7 +363,7 @@ _DtCvFreeArray (void **array) * * Return Value: * - * Purpose: IBM and USL do not support the 'strcasecmp' routine. This takes it's + * Purpose: IBM does not support the 'strcasecmp' routine. This takes it's * place. *****************************************************************************/ int @@ -410,7 +410,7 @@ _DtCvStrCaseCmp ( return result; } -#endif /* _AIX or USL */ +#endif /* _AIX */ /***************************************************************************** * Function: _DtCvStrNCaseCmpLatin1() diff --git a/cde/lib/DtHelp/CvStringI.h b/cde/lib/DtHelp/CvStringI.h index 4e15661c..5322b631 100644 --- a/cde/lib/DtHelp/CvStringI.h +++ b/cde/lib/DtHelp/CvStringI.h @@ -53,9 +53,9 @@ /***************************************************************************** * Extern defines *****************************************************************************/ -#if !defined(_AIX) && !defined(USL) +#if !defined(_AIX) #define _DtCvStrCaseCmp(s1,s2) strcasecmp(s1,s2) -#endif /* _AIX or USL */ +#endif /* _AIX */ extern void **_DtCvAddPtrToArray ( void **array, @@ -78,11 +78,11 @@ extern void *_DtCvStrPtr ( int type, int count); -#if defined(_AIX) || defined(USL) +#if defined(_AIX) extern int _DtCvStrCaseCmp( const char *s1, const char *s2); -#endif /* _AIX or USL */ +#endif /* _AIX */ extern int _DtCvStrCaseCmpLatin1( const char *s1, const char *s2); diff --git a/cde/lib/DtHelp/FreeBSD.lcx b/cde/lib/DtHelp/FreeBSD.lcx index 46091fe2..1d0f343f 100644 --- a/cde/lib/DtHelp/FreeBSD.lcx +++ b/cde/lib/DtHelp/FreeBSD.lcx @@ -207,61 +207,61 @@ FreeBSD.?.version.<.100: ".*" !! any CDE value ! setlocales Compliance FreeBSD.100+.setlocale.~.C.IBM-850: C ! setlocales compliance ,IBM FreeBSD.100+.setlocale.~.POSIX.IBM-850: POSIX ! setlocales compliance ,IBM -FreeBSD.100+.setlocale.~.C.ISO-8859-1: C ! setlocales compliance ,IBM, HP, Sun , USL -FreeBSD.100+.setlocale.~.POSIX.ISO-8859-1: POSIX ! setlocales compliance ,IBM, HP, Sun , USL +FreeBSD.100+.setlocale.~.C.ISO-8859-1: C ! setlocales compliance ,IBM, HP, Sun +FreeBSD.100+.setlocale.~.POSIX.ISO-8859-1: POSIX ! setlocales compliance ,IBM, HP, Sun ! W European/Americas, Latin 1 codeset -FreeBSD.100+.setlocale.~.da_DK.ISO-8859-1: da_DK !.ISO8859-1 ! Danish, Denmark XoJIG,IBM, HP, , USL ("da") -FreeBSD.100+.setlocale.>.de_AT.ISO-8859-1: de_DE !.ISO8859-1 ! German,Austria XoJIG, , , , USL -FreeBSD.100+.setlocale.~.de_CH.ISO-8859-1: de_CH !.ISO8859-1 ! German,Switzerland XoJIG,IBM, , , USL -FreeBSD.100+.setlocale.~.de_DE.ISO-8859-1: de_DE !.ISO8859-1 ! German, Germany XoJIG,IBM, HP, Sun ("de"), USL ("de") -FreeBSD.100+.setlocale.>.en_AU.ISO-8859-1: en_GB !.ISO8859-1 ! English,Australia , , , , USL -FreeBSD.100+.setlocale.>.en_CA.ISO-8859-1: en_US !.ISO8859-1 ! English,Canada XoJIG, , , , USL -FreeBSD.100+.setlocale.>.en_DK.ISO-8859-1: en_GB !.ISO8859-1 ! English, Denmark XoJIG, , , , USL -FreeBSD.100+.setlocale.~.en_GB.ISO-8859-1: en_GB !.ISO8859-1 ! English, U.K. XoJIG,IBM, HP, , USL ("en") +FreeBSD.100+.setlocale.~.da_DK.ISO-8859-1: da_DK !.ISO8859-1 ! Danish, Denmark XoJIG,IBM, HP, ("da") +FreeBSD.100+.setlocale.>.de_AT.ISO-8859-1: de_DE !.ISO8859-1 ! German,Austria XoJIG, , , +FreeBSD.100+.setlocale.~.de_CH.ISO-8859-1: de_CH !.ISO8859-1 ! German,Switzerland XoJIG,IBM, , +FreeBSD.100+.setlocale.~.de_DE.ISO-8859-1: de_DE !.ISO8859-1 ! German, Germany XoJIG,IBM, HP, Sun ("de") +FreeBSD.100+.setlocale.>.en_AU.ISO-8859-1: en_GB !.ISO8859-1 ! English,Australia , , , +FreeBSD.100+.setlocale.>.en_CA.ISO-8859-1: en_US !.ISO8859-1 ! English,Canada XoJIG, , , , +FreeBSD.100+.setlocale.>.en_DK.ISO-8859-1: en_GB !.ISO8859-1 ! English, Denmark XoJIG, , , , +FreeBSD.100+.setlocale.~.en_GB.ISO-8859-1: en_GB !.ISO8859-1 ! English, U.K. XoJIG,IBM, HP, FreeBSD.100+.setlocale.>.en_JP.ISO-8859-1: en_JP !.ISO8859-1 ! English, Japan XoJIG,IBM, , , FreeBSD.100+.setlocale.>.en_JP.ISO-8859-1: en_US !.ISO8859-1 ! English, Japan XoJIG,IBM, , , -FreeBSD.100+.setlocale.>.en_IE.ISO-8859-1: en_GB !.ISO8859-1 ! English, Ireland XoJIG, , , , USL -FreeBSD.100+.setlocale.>.en_MY.ISO-8859-1: en_US !.ISO8859-1 ! English,Malaysia , , , , USL -FreeBSD.100+.setlocale.>.en_NZ.ISO-8859-1: en_GB !.ISO8859-1 ! English,New Zealand , , , , USL -FreeBSD.100+.setlocale.>.en_KR.ISO-8859-1: en_KR !.ISO8859-1 ! English,Korea , , , , USL +FreeBSD.100+.setlocale.>.en_IE.ISO-8859-1: en_GB !.ISO8859-1 ! English, Ireland XoJIG, , , +FreeBSD.100+.setlocale.>.en_MY.ISO-8859-1: en_US !.ISO8859-1 ! English,Malaysia , , , +FreeBSD.100+.setlocale.>.en_NZ.ISO-8859-1: en_GB !.ISO8859-1 ! English,New Zealand , , , +FreeBSD.100+.setlocale.>.en_KR.ISO-8859-1: en_KR !.ISO8859-1 ! English,Korea , , , FreeBSD.100+.setlocale.>.en_KR.ISO-8859-1: en_US !.ISO8859-1 ! English,Korea ,IBM, , , -FreeBSD.100+.setlocale.>.en_TW.ISO-8859-1: en_TW !.ISO8859-1 ! English,Taiwan , , , , USL +FreeBSD.100+.setlocale.>.en_TW.ISO-8859-1: en_TW !.ISO8859-1 ! English,Taiwan , , , FreeBSD.100+.setlocale.>.en_TW.ISO-8859-1: en_US !.ISO8859-1 ! English,Taiwan ,IBM, , , -FreeBSD.100+.setlocale.~.en_US.ISO-8859-1: en_US !.ISO8859-1 ! English, USA XoJIG,IBM, HP, Sun , USL -FreeBSD.100+.setlocale.>.es_AR.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Argentina , , , Sun , USL +FreeBSD.100+.setlocale.~.en_US.ISO-8859-1: en_US !.ISO8859-1 ! English, USA XoJIG,IBM, HP, Sun +FreeBSD.100+.setlocale.>.es_AR.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Argentina , , , Sun FreeBSD.100+.setlocale.>.es_BO.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Bolivia , , , Sun -FreeBSD.100+.setlocale.>.es_CL.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Chile , , , Sun , USL +FreeBSD.100+.setlocale.>.es_CL.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Chile , , , Sun FreeBSD.100+.setlocale.>.es_CO.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Columbia , , , Sun FreeBSD.100+.setlocale.>.es_CR.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Costa Rica , , , Sun FreeBSD.100+.setlocale.>.es_EC.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Ecuador , , , Sun -FreeBSD.100+.setlocale.~.es_ES.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Spain XoJIG,IBM, HP, Sun , USL -FreeBSD.100+.setlocale.~.ca_ES.ISO-8859-1: ca_ES !.ISO8859-1 ! Catalan, Spain XoJIG,IBM, HP, Sun , USL +FreeBSD.100+.setlocale.~.es_ES.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Spain XoJIG,IBM, HP, Sun +FreeBSD.100+.setlocale.~.ca_ES.ISO-8859-1: ca_ES !.ISO8859-1 ! Catalan, Spain XoJIG,IBM, HP, Sun FreeBSD.100+.setlocale.>.es_GT.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Guatemala , , , Sun -FreeBSD.100+.setlocale.>.es_MX.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Mexico , , , Sun , USL +FreeBSD.100+.setlocale.>.es_MX.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Mexico , , , Sun FreeBSD.100+.setlocale.>.es_PE.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Peru , , , Sun FreeBSD.100+.setlocale.>.es_UY.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Uruguay , , , Sun -FreeBSD.100+.setlocale.>.es_VE.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Venezuela , , , Sun , USL +FreeBSD.100+.setlocale.>.es_VE.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Venezuela , , , Sun ! FreeBSD.100+.setlocale.>.et_EE.ISO-8859-1: ! Estonian, Estonia XoJIG, -FreeBSD.100+.setlocale.~.fi_FI.ISO-8859-1: fi_FI !.ISO8859-1 ! Finnish, Finland XoJIG,IBM, HP, , USL ("fi") +FreeBSD.100+.setlocale.~.fi_FI.ISO-8859-1: fi_FI !.ISO8859-1 ! Finnish, Finland XoJIG,IBM, HP, ! FreeBSD.100+.setlocale.>.fo_FO.ISO-8859-1: ! Faroese, Faeroe Island XoJIG, -FreeBSD.100+.setlocale.~.fr_BE.ISO-8859-1: fr_BE !.ISO8859-1 ! French,Belgium XoJIG, , , , USL -FreeBSD.100+.setlocale.~.fr_CA.ISO-8859-1: fr_CA !.ISO8859-1 ! French, Canada XoJIG,IBM, HP, , USL -FreeBSD.100+.setlocale.~.fr_CH.ISO-8859-1: fr_CH !.ISO8859-1 ! French, Switzerland XoJIG,IBM, , , USL -FreeBSD.100+.setlocale.~.fr_FR.ISO-8859-1: fr_FR !.ISO8859-1 ! French, France XoJIG,IBM, HP, Sun ("fr"), USL ("fr") -FreeBSD.100+.setlocale.~.is_IS.ISO-8859-1: is_IS !.ISO8859-1 ! Icelandic, Iceland XoJIG,IBM, HP, , USL ("is") -FreeBSD.100+.setlocale.>.it_CH.ISO-8859-1: it_IT !.ISO8859-1 ! Italian,Switzerland , , , , USL -FreeBSD.100+.setlocale.~.it_IT.ISO-8859-1: it_IT !.ISO8859-1 ! Italian, Italy XoJIG,IBM, HP, Sun ("it"), USL ("it") +FreeBSD.100+.setlocale.~.fr_BE.ISO-8859-1: fr_BE !.ISO8859-1 ! French,Belgium XoJIG, , , +FreeBSD.100+.setlocale.~.fr_CA.ISO-8859-1: fr_CA !.ISO8859-1 ! French, Canada XoJIG,IBM, HP, +FreeBSD.100+.setlocale.~.fr_CH.ISO-8859-1: fr_CH !.ISO8859-1 ! French, Switzerland XoJIG,IBM, , +FreeBSD.100+.setlocale.~.fr_FR.ISO-8859-1: fr_FR !.ISO8859-1 ! French, France XoJIG,IBM, HP, Sun ("fr"), +FreeBSD.100+.setlocale.~.is_IS.ISO-8859-1: is_IS !.ISO8859-1 ! Icelandic, Iceland XoJIG,IBM, HP, , +FreeBSD.100+.setlocale.>.it_CH.ISO-8859-1: it_IT !.ISO8859-1 ! Italian,Switzerland , , , , +FreeBSD.100+.setlocale.~.it_IT.ISO-8859-1: it_IT !.ISO8859-1 ! Italian, Italy XoJIG,IBM, HP, Sun ("it"), ! FreeBSD.100+.setlocale.>.kl_GL.ISO-8859-1: ! Greenlandic, Greenland XoJIG, ! FreeBSD.100+.setlocale.>.lt_LT.ISO-8859-1: ! Lithuanian, Lithuania XoJIG, ! FreeBSD.100+.setlocale.>.lv_LV.ISO-8859-1: ! Latvian, Latvia XoJIG, -FreeBSD.100+.setlocale.~.nl_BE.ISO-8859-1: nl_BE !.ISO8859-1 ! Dutch, Belgium XoJIG,IBM, , , USL -FreeBSD.100+.setlocale.~.nl_NL.ISO-8859-1: nl_NL !.ISO8859-1 ! Dutch, The Netherlands XoJIG,IBM, HP, , USL ("nl") -FreeBSD.100+.setlocale.~.no_NO.ISO-8859-1: no_NO !.ISO8859-1 ! Norwegian, Norway XoJIG,IBM, HP, , USL ("no") -FreeBSD.100+.setlocale.~.pt_BR.ISO-8859-1: pt_BR !.ISO8859-1 ! Portuguese,Brazil , , , , USL -FreeBSD.100+.setlocale.~.pt_PT.ISO-8859-1: pt_PT !.ISO8859-1 ! Portuguese, Portugal XoJIG,IBM, HP, , USL +FreeBSD.100+.setlocale.~.nl_BE.ISO-8859-1: nl_BE !.ISO8859-1 ! Dutch, Belgium XoJIG,IBM, , , +FreeBSD.100+.setlocale.~.nl_NL.ISO-8859-1: nl_NL !.ISO8859-1 ! Dutch, The Netherlands XoJIG,IBM, HP, , +FreeBSD.100+.setlocale.~.no_NO.ISO-8859-1: no_NO !.ISO8859-1 ! Norwegian, Norway XoJIG,IBM, HP, , +FreeBSD.100+.setlocale.~.pt_BR.ISO-8859-1: pt_BR !.ISO8859-1 ! Portuguese,Brazil , , , , +FreeBSD.100+.setlocale.~.pt_PT.ISO-8859-1: pt_PT !.ISO8859-1 ! Portuguese, Portugal XoJIG,IBM, HP, , FreeBSD.100+.setlocale.>.sv_FI.ISO-8859-1: sv_SE !.ISO8859-1 ! Swedish, Finland XoJIG, -FreeBSD.100+.setlocale.~.sv_SE.ISO-8859-1: sv_SE !.ISO8859-1 ! Swedish, Sweden XoJIG,IBM, HP, Sun ("sv"), USL ("sv") +FreeBSD.100+.setlocale.~.sv_SE.ISO-8859-1: sv_SE !.ISO8859-1 ! Swedish, Sweden XoJIG,IBM, HP, Sun ("sv"), ! E European @@ -298,14 +298,14 @@ FreeBSD.100+.setlocale.~.el_GR.ISO-8859-7: el_GR !.ISO8859-7 ! Greek, Greece FreeBSD.100+.setlocale.~.tr_TR.ISO-8859-9: tr_TR !.ISO8859-9 ! Turkish, Turkey ,IBM, HP ! East Asia -FreeBSD.100+.setlocale.~.ja_JP.EUC-JP: ja_JP !.IBM-eucJP ! Japanese, Japan ,IBM, HP, Sun ("ja"), USL +FreeBSD.100+.setlocale.~.ja_JP.EUC-JP: ja_JP !.IBM-eucJP ! Japanese, Japan ,IBM, HP, Sun ("ja"), FreeBSD.100+.setlocale.~.ja_JP.IBM-932: Ja_JP !.IBM-932 ! Japanese, Japan ,IBM FreeBSD.100+.setlocale.>.ja_JP.HP-SJIS: Ja_JP !.IBM-932 ! Japanese, Japan aka japanese 15 , , HP, -FreeBSD.100+.setlocale.~.ko_KR.EUC-KR: ko_KR !.IBM-eucKR ! Korean, Korea ,IBM, HP, Sun ("ko"), USL -FreeBSD.100+.setlocale.~.zh_CN.EUC-CN: zh_CN !.IBM-eucCN ! Chinese, China ,IBM, , Sun ("zh"), USL +FreeBSD.100+.setlocale.~.ko_KR.EUC-KR: ko_KR !.IBM-eucKR ! Korean, Korea ,IBM, HP, Sun ("ko"), +FreeBSD.100+.setlocale.~.zh_CN.EUC-CN: zh_CN !.IBM-eucCN ! Chinese, China ,IBM, , Sun ("zh"), FreeBSD.100+.setlocale.>.zh_CN.HP-15CN: zh_CN !.IBM-eucCN ! Chinese, China , , HP FreeBSD.100+.setlocale.~.zh_CN.UTF-8: ZH_CN !.UTF-8 ! Chinese, China ,IBM, -FreeBSD.100+.setlocale.~.zh_TW.EUC-TW: zh_TW !.IBM-eucTW ! Chinese, Taiwan ,IBM, HP, Sun , USL +FreeBSD.100+.setlocale.~.zh_TW.EUC-TW: zh_TW !.IBM-eucTW ! Chinese, Taiwan ,IBM, HP, Sun , FreeBSD.100+.setlocale.>.zh_TW.HP-BIG5: Zh_TW !.big5 ! Chinese, Taiwan ,IBM, HP, , ! FreeBSD.100+.setlocale.>.zh_TW.HP-CCDC: ! Chinese, Taiwan , , HP, , ! FreeBSD.100+.setlocale.>.ja_JP.HP-KANA8: ! Japanese, Japan , , HP, , diff --git a/cde/lib/DtHelp/HP-UX.lcx b/cde/lib/DtHelp/HP-UX.lcx index 1ed39239..0acd5600 100644 --- a/cde/lib/DtHelp/HP-UX.lcx +++ b/cde/lib/DtHelp/HP-UX.lcx @@ -210,61 +210,61 @@ HP-UX.?.version.<.800: "[A-Z]\\.08\\..*" !! any HPUX 8.x version ! ---- - --------- ! setlocales Compliance -HP-UX.700+.setlocale.~.C.HP-ROMAN8: C ! setlocales compliance ,IBM, HP, Sun , USL -HP-UX.700+.setlocale.<.C.HP-ROMAN8: C.roman8 ! setlocales compliance ,IBM, HP, Sun , USL -HP-UX.700+.setlocale.~.C.ISO-8859-1: C.iso88591 ! setlocales compliance ,IBM, HP, Sun , USL -HP-UX.700+.setlocale.~.POSIX.HP-ROMAN8: POSIX ! setlocales compliance ,IBM, HP, Sun , USL -HP-UX.700+.setlocale.<.POSIX.HP-ROMAN8: POSIX.roman8 ! setlocales compliance ,IBM, HP, Sun , USL -HP-UX.700+.setlocale.~.POSIX.ISO-8859-1: POSIX.iso88591 ! setlocales compliance ,IBM, HP, Sun , USL +HP-UX.700+.setlocale.~.C.HP-ROMAN8: C ! setlocales compliance ,IBM, HP, Sun , +HP-UX.700+.setlocale.<.C.HP-ROMAN8: C.roman8 ! setlocales compliance ,IBM, HP, Sun , +HP-UX.700+.setlocale.~.C.ISO-8859-1: C.iso88591 ! setlocales compliance ,IBM, HP, Sun , +HP-UX.700+.setlocale.~.POSIX.HP-ROMAN8: POSIX ! setlocales compliance ,IBM, HP, Sun , +HP-UX.700+.setlocale.<.POSIX.HP-ROMAN8: POSIX.roman8 ! setlocales compliance ,IBM, HP, Sun , +HP-UX.700+.setlocale.~.POSIX.ISO-8859-1: POSIX.iso88591 ! setlocales compliance ,IBM, HP, Sun , ! W European/Americas, Latin 1 codeset -HP-UX.700+.setlocale.~.da_DK.ISO-8859-1: danish.iso88591 ! Danish, Denmark XoJIG,IBM, HP, , USL ("da") -HP-UX.700+.setlocale.>.de_AT.ISO-8859-1: german.iso88591 ! German,Austria XoJIG, , , , USL -HP-UX.700+.setlocale.>.de_CH.ISO-8859-1: german.iso88591 ! German,Switzerland XoJIG,IBM, , , USL -HP-UX.700+.setlocale.~.de_DE.ISO-8859-1: german.iso88591 ! German, Germany XoJIG,IBM, HP, Sun ("de"), USL ("de") -HP-UX.700+.setlocale.>.en_AU.ISO-8859-1: english.iso88591 ! English,Australia , , , , USL -HP-UX.700+.setlocale.>.en_CA.ISO-8859-1: english.iso88591 ! English,Canada XoJIG, , , , USL -HP-UX.700+.setlocale.>.en_DK.ISO-8859-1: english.iso88591 ! English, Denmark XoJIG, , , , USL -HP-UX.700+.setlocale.>.en_GB.ISO-8859-1: english.iso88591 ! English, U.K. XoJIG,IBM, HP, , USL ("en") +HP-UX.700+.setlocale.~.da_DK.ISO-8859-1: danish.iso88591 ! Danish, Denmark XoJIG,IBM, HP, , +HP-UX.700+.setlocale.>.de_AT.ISO-8859-1: german.iso88591 ! German,Austria XoJIG, , , , +HP-UX.700+.setlocale.>.de_CH.ISO-8859-1: german.iso88591 ! German,Switzerland XoJIG,IBM, , , +HP-UX.700+.setlocale.~.de_DE.ISO-8859-1: german.iso88591 ! German, Germany XoJIG,IBM, HP, Sun ("de"), +HP-UX.700+.setlocale.>.en_AU.ISO-8859-1: english.iso88591 ! English,Australia , , , , +HP-UX.700+.setlocale.>.en_CA.ISO-8859-1: english.iso88591 ! English,Canada XoJIG, , , , +HP-UX.700+.setlocale.>.en_DK.ISO-8859-1: english.iso88591 ! English, Denmark XoJIG, , , , +HP-UX.700+.setlocale.>.en_GB.ISO-8859-1: english.iso88591 ! English, U.K. XoJIG,IBM, HP, , HP-UX.700+.setlocale.>.en_JP.ISO-8859-1: english.iso88591 ! English, Japan XoJIG,IBM, , , -HP-UX.700+.setlocale.>.en_IE.ISO-8859-1: english.iso88591 ! English, Ireland XoJIG, , , , USL +HP-UX.700+.setlocale.>.en_IE.ISO-8859-1: english.iso88591 ! English, Ireland XoJIG, , , , HP-UX.700+.setlocale.>.en_KR.ISO-8859-1: english.iso88591 ! English,Korea , , , , -HP-UX.700+.setlocale.>.en_MY.ISO-8859-1: english.iso88591 ! English,Malaysia , , , , USL -HP-UX.700+.setlocale.>.en_NZ.ISO-8859-1: english.iso88591 ! English,New Zealand , , , , USL +HP-UX.700+.setlocale.>.en_MY.ISO-8859-1: english.iso88591 ! English,Malaysia , , , , +HP-UX.700+.setlocale.>.en_NZ.ISO-8859-1: english.iso88591 ! English,New Zealand , , , , HP-UX.700+.setlocale.>.en_TW.ISO-8859-1: english.iso88591 ! English,Taiwan , , , , -HP-UX.700+.setlocale.~.en_US.ISO-8859-1: english.iso88591 ! English, USA XoJIG,IBM, HP, Sun , USL -HP-UX.700+.setlocale.>.es_AR.ISO-8859-1: spanish.iso88591 ! Spanish, Argentina , , , Sun , USL +HP-UX.700+.setlocale.~.en_US.ISO-8859-1: english.iso88591 ! English, USA XoJIG,IBM, HP, Sun , +HP-UX.700+.setlocale.>.es_AR.ISO-8859-1: spanish.iso88591 ! Spanish, Argentina , , , Sun , HP-UX.700+.setlocale.>.es_BO.ISO-8859-1: spanish.iso88591 ! Spanish, Bolivia , , , Sun -HP-UX.700+.setlocale.>.es_CL.ISO-8859-1: spanish.iso88591 ! Spanish, Chile , , , Sun , USL +HP-UX.700+.setlocale.>.es_CL.ISO-8859-1: spanish.iso88591 ! Spanish, Chile , , , Sun , HP-UX.700+.setlocale.>.es_CO.ISO-8859-1: spanish.iso88591 ! Spanish, Columbia , , , Sun HP-UX.700+.setlocale.>.es_CR.ISO-8859-1: spanish.iso88591 ! Spanish, Costa Rica , , , Sun HP-UX.700+.setlocale.>.es_EC.ISO-8859-1: spanish.iso88591 ! Spanish, Ecuador , , , Sun -HP-UX.700+.setlocale.~.es_ES.ISO-8859-1: spanish.iso88591 ! Spanish, Spain XoJIG,IBM, HP, Sun , USL +HP-UX.700+.setlocale.~.es_ES.ISO-8859-1: spanish.iso88591 ! Spanish, Spain XoJIG,IBM, HP, Sun , HP-UX.700+.setlocale.>.es_GT.ISO-8859-1: spanish.iso88591 ! Spanish, Guatemala , , , Sun -HP-UX.700+.setlocale.>.es_MX.ISO-8859-1: spanish.iso88591 ! Spanish, Mexico , , , Sun , USL +HP-UX.700+.setlocale.>.es_MX.ISO-8859-1: spanish.iso88591 ! Spanish, Mexico , , , Sun , HP-UX.700+.setlocale.>.es_PE.ISO-8859-1: spanish.iso88591 ! Spanish, Peru , , , Sun HP-UX.700+.setlocale.>.es_UY.ISO-8859-1: spanish.iso88591 ! Spanish, Uruguay , , , Sun -HP-UX.700+.setlocale.>.es_VE.ISO-8859-1: spanish.iso88591 ! Spanish, Venezuela , , , Sun , USL +HP-UX.700+.setlocale.>.es_VE.ISO-8859-1: spanish.iso88591 ! Spanish, Venezuela , , , Sun , ! HP-UX.700+.setlocale.>.et_EE.ISO-8859-1: ! Estonian, Estonia XoJIG, -HP-UX.700+.setlocale.~.fi_FI.ISO-8859-1: finnish.iso88591 ! Finnish, Finland XoJIG,IBM, HP, , USL ("fi") +HP-UX.700+.setlocale.~.fi_FI.ISO-8859-1: finnish.iso88591 ! Finnish, Finland XoJIG,IBM, HP, , ! HP-UX.700+.setlocale.>.fo_FO.ISO-8859-1: ! Faroese, Faeroe Island XoJIG, -HP-UX.700+.setlocale.>.fr_BE.ISO-8859-1: french.iso88591 ! French,Belgium XoJIG, , , , USL -HP-UX.700+.setlocale.~.fr_CA.ISO-8859-1: c-french.iso88591 ! French, Canada XoJIG,IBM, HP, , USL -HP-UX.700+.setlocale.>.fr_CH.ISO-8859-1: french.iso88591 ! French, Switzerland XoJIG,IBM, , , USL -HP-UX.700+.setlocale.~.fr_FR.ISO-8859-1: french.iso88591 ! French, France XoJIG,IBM, HP, Sun ("fr"), USL ("fr") -HP-UX.700+.setlocale.~.is_IS.ISO-8859-1: icelandic.iso88591 ! Icelandic, Iceland XoJIG,IBM, HP, , USL ("is") -HP-UX.700+.setlocale.>.it_CH.ISO-8859-1: italian.iso88591 ! Italian,Switzerland , , , , USL -HP-UX.700+.setlocale.~.it_IT.ISO-8859-1: italian.iso88591 ! Italian, Italy XoJIG,IBM, HP, Sun ("it"), USL ("it") +HP-UX.700+.setlocale.>.fr_BE.ISO-8859-1: french.iso88591 ! French,Belgium XoJIG, , , , +HP-UX.700+.setlocale.~.fr_CA.ISO-8859-1: c-french.iso88591 ! French, Canada XoJIG,IBM, HP, , +HP-UX.700+.setlocale.>.fr_CH.ISO-8859-1: french.iso88591 ! French, Switzerland XoJIG,IBM, , , +HP-UX.700+.setlocale.~.fr_FR.ISO-8859-1: french.iso88591 ! French, France XoJIG,IBM, HP, Sun ("fr"), +HP-UX.700+.setlocale.~.is_IS.ISO-8859-1: icelandic.iso88591 ! Icelandic, Iceland XoJIG,IBM, HP, , +HP-UX.700+.setlocale.>.it_CH.ISO-8859-1: italian.iso88591 ! Italian,Switzerland , , , , +HP-UX.700+.setlocale.~.it_IT.ISO-8859-1: italian.iso88591 ! Italian, Italy XoJIG,IBM, HP, Sun ("it"), ! HP-UX.700+.setlocale.>.kl_GL.ISO-8859-1: ! Greenlandic, Greenland XoJIG, ! HP-UX.700+.setlocale.>.lt_LT.ISO-8859-1: ! Lithuanian, Lithuania XoJIG, ! HP-UX.700+.setlocale.>.lv_LV.ISO-8859-1: ! Latvian, Latvia XoJIG, -HP-UX.700+.setlocale.>.nl_BE.ISO-8859-1: dutch.iso88591 ! Dutch, Belgium XoJIG,IBM, , , USL -HP-UX.700+.setlocale.~.nl_NL.ISO-8859-1: dutch.iso88591 ! Dutch, The Netherlands XoJIG,IBM, HP, , USL ("nl") -HP-UX.700+.setlocale.~.no_NO.ISO-8859-1: norwegian.iso88591 ! Norwegian, Norway XoJIG,IBM, HP, , USL ("no") -HP-UX.700+.setlocale.>.pt_BR.ISO-8859-1: portuguese.iso88591 ! Portuguese,Brazil , , , , USL -HP-UX.700+.setlocale.~.pt_PT.ISO-8859-1: portuguese.iso88591 ! Portuguese, Portugal XoJIG,IBM, HP, , USL +HP-UX.700+.setlocale.>.nl_BE.ISO-8859-1: dutch.iso88591 ! Dutch, Belgium XoJIG,IBM, , , +HP-UX.700+.setlocale.~.nl_NL.ISO-8859-1: dutch.iso88591 ! Dutch, The Netherlands XoJIG,IBM, HP, , +HP-UX.700+.setlocale.~.no_NO.ISO-8859-1: norwegian.iso88591 ! Norwegian, Norway XoJIG,IBM, HP, , +HP-UX.700+.setlocale.>.pt_BR.ISO-8859-1: portuguese.iso88591 ! Portuguese,Brazil , , , , +HP-UX.700+.setlocale.~.pt_PT.ISO-8859-1: portuguese.iso88591 ! Portuguese, Portugal XoJIG,IBM, HP, , HP-UX.700+.setlocale.>.sv_FI.ISO-8859-1: swedish.iso88591 ! Swedish, Finland XoJIG, -HP-UX.700+.setlocale.~.sv_SE.ISO-8859-1: swedish.iso88591 ! Swedish, Sweden XoJIG,IBM, HP, Sun ("sv"), USL ("sv") +HP-UX.700+.setlocale.~.sv_SE.ISO-8859-1: swedish.iso88591 ! Swedish, Sweden XoJIG,IBM, HP, Sun ("sv"), ! W European/Americas, HP-ROMAN8 codeset HP-UX.700+.setlocale.~.da_DK.HP-ROMAN8: danish ! Danish, Denmark , , HP @@ -319,15 +319,15 @@ HP-UX.700+.setlocale.~.tr_TR.ISO-8859-9: turkish.iso88599 ! Turkish, Turkey HP-UX.700+.setlocale.~.tr_TR.HP-TURKISH8: turkish ! Turkish, Turkey , , HP ! East Asia -HP-UX.700+.setlocale.~.ja_JP.EUC-JP: japanese.euc ! Japanese, Japan ,IBM, HP, Sun ("ja"), USL +HP-UX.700+.setlocale.~.ja_JP.EUC-JP: japanese.euc ! Japanese, Japan ,IBM, HP, Sun ("ja"), HP-UX.700+.setlocale.~.ja_JP.HP-SJIS: japanese ! Japanese, Japan aka japanese 15 , , HP, -HP-UX.700+.setlocale.>.ja_JP.IBM-932: japanese ! Japanese, Japan ,IBM, HP, Sun ("ja"), USL +HP-UX.700+.setlocale.>.ja_JP.IBM-932: japanese ! Japanese, Japan ,IBM, HP, Sun ("ja"), HP-UX.700+.setlocale.~.ja_JP.HP-KANA8: katakana ! Japanese, Japan , , HP, , HP-UX.700+.setlocale.<.ja_JP.EUC-JP: ujis ! Japanese, Japan , , HP, -HP-UX.700+.setlocale.~.ko_KR.EUC-KR: korean ! Korean, Korea ,IBM, HP, Sun ("ko"), USL -HP-UX.700+.setlocale.>.zh_CN.EUC-CN: chinese-s ! Chinese, China ,IBM, , Sun ("zh"), USL +HP-UX.700+.setlocale.~.ko_KR.EUC-KR: korean ! Korean, Korea ,IBM, HP, Sun ("ko"), +HP-UX.700+.setlocale.>.zh_CN.EUC-CN: chinese-s ! Chinese, China ,IBM, , Sun ("zh"), HP-UX.700+.setlocale.~.zh_CN.HP-15CN: chinese-s ! Chinese, China , , HP -HP-UX.700+.setlocale.~.zh_TW.EUC-TW: zh_TW.eucTW ! Chinese, Taiwan ,IBM, HP, Sun , USL +HP-UX.700+.setlocale.~.zh_TW.EUC-TW: zh_TW.eucTW ! Chinese, Taiwan ,IBM, HP, Sun , HP-UX.700+.setlocale.~.zh_TW.HP-BIG5: chinese-t.big5 ! Chinese, Taiwan , , HP, , HP-UX.700+.setlocale.~.zh_TW.HP-CCDC: chinese-t ! Chinese, Taiwan , , HP, , @@ -335,54 +335,54 @@ HP-UX.700+.setlocale.~.zh_TW.HP-CCDC: chinese-t ! Chinese, Taiwan HP-UX.700+.setlocale.~.th_TH.TIS-620: thai ! Thai, Thailand ,IBM, HP ! setlocales Compliance; default codeset on 10.01 systems -HP-UX.1000+.setlocale.~.C.ISO-8859-1: C ! setlocales compliance ,IBM, HP, Sun , USL -HP-UX.1000+.setlocale.~.POSIX.ISO-8859-1: POSIX ! setlocales compliance ,IBM, HP, Sun , USL +HP-UX.1000+.setlocale.~.C.ISO-8859-1: C ! setlocales compliance ,IBM, HP, Sun , +HP-UX.1000+.setlocale.~.POSIX.ISO-8859-1: POSIX ! setlocales compliance ,IBM, HP, Sun , ! W European/Americas, Latin 1 codeset -HP-UX.1000+.setlocale.>.de_AT.ISO-8859-1: de_DE.iso88591 ! German,Austria XoJIG, , , , USL -HP-UX.1000+.setlocale.>.de_CH.ISO-8859-1: de_DE.iso88591 ! German,Switzerland XoJIG,IBM, , , USL -HP-UX.1000+.setlocale.~.de_DE.ISO-8859-1: de_DE.iso88591 ! German, Germany XoJIG,IBM, HP, Sun ("de"), USL ("de") -HP-UX.1000+.setlocale.>.en_AU.ISO-8859-1: en_GB.iso88591 ! English,Australia , , , , USL -HP-UX.1000+.setlocale.>.en_CA.ISO-8859-1: en_US.iso88591 ! English,Canada XoJIG, , , , USL -HP-UX.1000+.setlocale.>.en_DK.ISO-8859-1: en_GB.iso88591 ! English, Denmark XoJIG, , , , USL -HP-UX.1000+.setlocale.>.en_GB.ISO-8859-1: en_GB.iso88591 ! English, U.K. XoJIG,IBM, HP, , USL ("en") +HP-UX.1000+.setlocale.>.de_AT.ISO-8859-1: de_DE.iso88591 ! German,Austria XoJIG, , , , +HP-UX.1000+.setlocale.>.de_CH.ISO-8859-1: de_DE.iso88591 ! German,Switzerland XoJIG,IBM, , , +HP-UX.1000+.setlocale.~.de_DE.ISO-8859-1: de_DE.iso88591 ! German, Germany XoJIG,IBM, HP, Sun ("de"), +HP-UX.1000+.setlocale.>.en_AU.ISO-8859-1: en_GB.iso88591 ! English,Australia , , , , +HP-UX.1000+.setlocale.>.en_CA.ISO-8859-1: en_US.iso88591 ! English,Canada XoJIG, , , , +HP-UX.1000+.setlocale.>.en_DK.ISO-8859-1: en_GB.iso88591 ! English, Denmark XoJIG, , , , +HP-UX.1000+.setlocale.>.en_GB.ISO-8859-1: en_GB.iso88591 ! English, U.K. XoJIG,IBM, HP, , HP-UX.1000+.setlocale.>.en_JP.ISO-8859-1: en_GB.iso88591 ! English, Japan XoJIG,IBM, , , -HP-UX.1000+.setlocale.>.en_IE.ISO-8859-1: en_GB.iso88591 ! English, Ireland XoJIG, , , , USL -HP-UX.1000+.setlocale.>.en_MY.ISO-8859-1: en_US.iso88591 ! English,Malaysia , , , , USL -HP-UX.1000+.setlocale.>.en_NZ.ISO-8859-1: en_GB.iso88591 ! English,New Zealand , , , , USL -HP-UX.1000+.setlocale.~.en_US.ISO-8859-1: en_US.iso88591 ! English, USA XoJIG,IBM, HP, Sun , USL -HP-UX.1000+.setlocale.>.es_AR.ISO-8859-1: es_ES.iso88591 ! Spanish, Argentina , , , Sun , USL +HP-UX.1000+.setlocale.>.en_IE.ISO-8859-1: en_GB.iso88591 ! English, Ireland XoJIG, , , , +HP-UX.1000+.setlocale.>.en_MY.ISO-8859-1: en_US.iso88591 ! English,Malaysia , , , , +HP-UX.1000+.setlocale.>.en_NZ.ISO-8859-1: en_GB.iso88591 ! English,New Zealand , , , , +HP-UX.1000+.setlocale.~.en_US.ISO-8859-1: en_US.iso88591 ! English, USA XoJIG,IBM, HP, Sun , +HP-UX.1000+.setlocale.>.es_AR.ISO-8859-1: es_ES.iso88591 ! Spanish, Argentina , , , Sun , HP-UX.1000+.setlocale.>.es_BO.ISO-8859-1: es_ES.iso88591 ! Spanish, Bolivia , , , Sun -HP-UX.1000+.setlocale.>.es_CL.ISO-8859-1: es_ES.iso88591 ! Spanish, Chile , , , Sun , USL +HP-UX.1000+.setlocale.>.es_CL.ISO-8859-1: es_ES.iso88591 ! Spanish, Chile , , , Sun , HP-UX.1000+.setlocale.>.es_CO.ISO-8859-1: es_ES.iso88591 ! Spanish, Columbia , , , Sun HP-UX.1000+.setlocale.>.es_CR.ISO-8859-1: es_ES.iso88591 ! Spanish, Costa Rica , , , Sun HP-UX.1000+.setlocale.>.es_EC.ISO-8859-1: es_ES.iso88591 ! Spanish, Ecuador , , , Sun -HP-UX.1000+.setlocale.~.es_ES.ISO-8859-1: es_ES.iso88591 ! Spanish, Spain XoJIG,IBM, HP, Sun , USL +HP-UX.1000+.setlocale.~.es_ES.ISO-8859-1: es_ES.iso88591 ! Spanish, Spain XoJIG,IBM, HP, Sun , HP-UX.1000+.setlocale.>.es_GT.ISO-8859-1: es_ES.iso88591 ! Spanish, Guatemala , , , Sun -HP-UX.1000+.setlocale.>.es_MX.ISO-8859-1: es_ES.iso88591 ! Spanish, Mexico , , , Sun , USL +HP-UX.1000+.setlocale.>.es_MX.ISO-8859-1: es_ES.iso88591 ! Spanish, Mexico , , , Sun , HP-UX.1000+.setlocale.>.es_PE.ISO-8859-1: es_ES.iso88591 ! Spanish, Peru , , , Sun HP-UX.1000+.setlocale.>.es_UY.ISO-8859-1: es_ES.iso88591 ! Spanish, Uruguay , , , Sun -HP-UX.1000+.setlocale.>.es_VE.ISO-8859-1: es_ES.iso88591 ! Spanish, Venezuela , , , Sun , USL +HP-UX.1000+.setlocale.>.es_VE.ISO-8859-1: es_ES.iso88591 ! Spanish, Venezuela , , , Sun , ! HP-UX.1000+.setlocale.>.et_EE.ISO-8859-1: ! Estonian, Estonia XoJIG, -HP-UX.1000+.setlocale.~.fi_FI.ISO-8859-1: fi_FI.iso88591 ! Finnish, Finland XoJIG,IBM, HP, , USL ("fi") +HP-UX.1000+.setlocale.~.fi_FI.ISO-8859-1: fi_FI.iso88591 ! Finnish, Finland XoJIG,IBM, HP, , ! HP-UX.1000+.setlocale.>.fo_FO.ISO-8859-1: ! Faroese, Faeroe Island XoJIG, -HP-UX.1000+.setlocale.>.fr_BE.ISO-8859-1: fr_FR.iso88591 ! French,Belgium XoJIG, , , , USL -HP-UX.1000+.setlocale.~.fr_CA.ISO-8859-1: fr_CA.iso88591 ! French, Canada XoJIG,IBM, HP, , USL -HP-UX.1000+.setlocale.>.fr_CH.ISO-8859-1: fr_FR.iso88591 ! French, Switzerland XoJIG,IBM, , , USL -HP-UX.1000+.setlocale.~.fr_FR.ISO-8859-1: fr_FR.iso88591 ! French, France XoJIG,IBM, HP, Sun ("fr"), USL ("fr") -HP-UX.1000+.setlocale.~.is_IS.ISO-8859-1: is_IS.iso88591 ! Icelandic, Iceland XoJIG,IBM, HP, , USL ("is") -HP-UX.1000+.setlocale.>.it_CH.ISO-8859-1: it_IT.iso88591 ! Italian,Switzerland , , , , USL -HP-UX.1000+.setlocale.~.it_IT.ISO-8859-1: it_IT.iso88591 ! Italian, Italy XoJIG,IBM, HP, Sun ("it"), USL ("it") +HP-UX.1000+.setlocale.>.fr_BE.ISO-8859-1: fr_FR.iso88591 ! French,Belgium XoJIG, , , , +HP-UX.1000+.setlocale.~.fr_CA.ISO-8859-1: fr_CA.iso88591 ! French, Canada XoJIG,IBM, HP, , +HP-UX.1000+.setlocale.>.fr_CH.ISO-8859-1: fr_FR.iso88591 ! French, Switzerland XoJIG,IBM, , , +HP-UX.1000+.setlocale.~.fr_FR.ISO-8859-1: fr_FR.iso88591 ! French, France XoJIG,IBM, HP, Sun ("fr"), +HP-UX.1000+.setlocale.~.is_IS.ISO-8859-1: is_IS.iso88591 ! Icelandic, Iceland XoJIG,IBM, HP, , +HP-UX.1000+.setlocale.>.it_CH.ISO-8859-1: it_IT.iso88591 ! Italian,Switzerland , , , , +HP-UX.1000+.setlocale.~.it_IT.ISO-8859-1: it_IT.iso88591 ! Italian, Italy XoJIG,IBM, HP, Sun ("it"), ! HP-UX.1000+.setlocale.>.kl_GL.ISO-8859-1: ! Greenlandic, Greenland XoJIG, ! HP-UX.1000+.setlocale.>.lt_LT.ISO-8859-1: ! Lithuanian, Lithuania XoJIG, ! HP-UX.1000+.setlocale.>.lv_LV.ISO-8859-1: ! Latvian, Latvia XoJIG, -HP-UX.1000+.setlocale.>.nl_BE.ISO-8859-1: nl_NL.iso88591 ! Dutch, Belgium XoJIG,IBM, , , USL -HP-UX.1000+.setlocale.~.nl_NL.ISO-8859-1: nl_NL.iso88591 ! Dutch, The Netherlands XoJIG,IBM, HP, , USL ("nl") -HP-UX.1000+.setlocale.~.no_NO.ISO-8859-1: no_NO.iso88591 ! Norwegian, Norway XoJIG,IBM, HP, , USL ("no") -HP-UX.1000+.setlocale.>.pt_BR.ISO-8859-1: pt_PT.iso88591 ! Portuguese,Brazil , , , , USL -HP-UX.1000+.setlocale.~.pt_PT.ISO-8859-1: pt_PT.iso88591 ! Portuguese, Portugal XoJIG,IBM, HP, , USL +HP-UX.1000+.setlocale.>.nl_BE.ISO-8859-1: nl_NL.iso88591 ! Dutch, Belgium XoJIG,IBM, , , +HP-UX.1000+.setlocale.~.nl_NL.ISO-8859-1: nl_NL.iso88591 ! Dutch, The Netherlands XoJIG,IBM, HP, , +HP-UX.1000+.setlocale.~.no_NO.ISO-8859-1: no_NO.iso88591 ! Norwegian, Norway XoJIG,IBM, HP, , +HP-UX.1000+.setlocale.>.pt_BR.ISO-8859-1: pt_PT.iso88591 ! Portuguese,Brazil , , , , +HP-UX.1000+.setlocale.~.pt_PT.ISO-8859-1: pt_PT.iso88591 ! Portuguese, Portugal XoJIG,IBM, HP, , HP-UX.1000+.setlocale.>.sv_FI.ISO-8859-1: sv_SE.iso88591 ! Swedish, Finland XoJIG, -HP-UX.1000+.setlocale.~.sv_SE.ISO-8859-1: sv_SE.iso88591 ! Swedish, Sweden XoJIG,IBM, HP, Sun ("sv"), USL ("sv") +HP-UX.1000+.setlocale.~.sv_SE.ISO-8859-1: sv_SE.iso88591 ! Swedish, Sweden XoJIG,IBM, HP, Sun ("sv"), ! W European/Americas, HP-ROMAN8 codeset HP-UX.1000+.setlocale.~.da_DK.HP-ROMAN8: da_DK.roman8 ! Danish, Denmark , , HP @@ -437,14 +437,14 @@ HP-UX.1000+.setlocale.~.tr_TR.ISO-8859-9: tr_TR.iso88599 ! Turkish, Turkey HP-UX.1000+.setlocale.~.tr_TR.HP-TURKISH8: tr_TR.turkish8 ! Turkish, Turkey , , HP ! East Asia -HP-UX.1000+.setlocale.~.ja_JP.EUC-JP: ja_JP.eucJP ! Japanese, Japan ,IBM, HP, Sun ("ja"), USL -HP-UX.1000+.setlocale.~.ja_JP.HP-SJIS: ja_JP.SJIS ! Japanese, Japan ,IBM, HP, Sun ("ja"), USL -HP-UX.1000+.setlocale.>.ja_JP.IBM-932: ja_JP.SJIS ! Japanese, Japan ,IBM, HP, Sun ("ja"), USL +HP-UX.1000+.setlocale.~.ja_JP.EUC-JP: ja_JP.eucJP ! Japanese, Japan ,IBM, HP, Sun ("ja"), +HP-UX.1000+.setlocale.~.ja_JP.HP-SJIS: ja_JP.SJIS ! Japanese, Japan ,IBM, HP, Sun ("ja"), +HP-UX.1000+.setlocale.>.ja_JP.IBM-932: ja_JP.SJIS ! Japanese, Japan ,IBM, HP, Sun ("ja"), HP-UX.1000+.setlocale.~.ja_JP.HP-KANA8: ja_JP.kana8 ! Japanese, Japan , , HP, , -HP-UX.1000+.setlocale.~.ko_KR.EUC-KR: ko_KR.eucKR ! Korean, Korea ,IBM, HP, Sun ("ko"), USL -HP-UX.1000+.setlocale.>.zh_CN.EUC-CN: zh_CN.15CN ! Chinese, China ,IBM, HP, Sun ("zh"), USL -HP-UX.1000+.setlocale.~.zh_CN.HP-15CN: zh_CN.15CN ! Chinese, China ,IBM, HP, Sun ("zh"), USL -HP-UX.1000+.setlocale.~.zh_TW.EUC-TW: zh_TW.eucTW ! Chinese, Taiwan ,IBM, HP, Sun , USL +HP-UX.1000+.setlocale.~.ko_KR.EUC-KR: ko_KR.eucKR ! Korean, Korea ,IBM, HP, Sun ("ko"), +HP-UX.1000+.setlocale.>.zh_CN.EUC-CN: zh_CN.15CN ! Chinese, China ,IBM, HP, Sun ("zh"), +HP-UX.1000+.setlocale.~.zh_CN.HP-15CN: zh_CN.15CN ! Chinese, China ,IBM, HP, Sun ("zh"), +HP-UX.1000+.setlocale.~.zh_TW.EUC-TW: zh_TW.eucTW ! Chinese, Taiwan ,IBM, HP, Sun , HP-UX.1000+.setlocale.~.zh_TW.HP-BIG5: zh_TW.big5 ! Chinese, Taiwan , , HP, , HP-UX.1000+.setlocale.~.zh_TW.HP-CCDC: zh_TW.ccdc ! Chinese, Taiwan , , HP, , diff --git a/cde/lib/DtHelp/Linux.lcx b/cde/lib/DtHelp/Linux.lcx index 77173c4c..b9416316 100644 --- a/cde/lib/DtHelp/Linux.lcx +++ b/cde/lib/DtHelp/Linux.lcx @@ -207,61 +207,62 @@ Linux.?.version.<.100: ".*" !! any CDE value ! setlocales Compliance Linux.100+.setlocale.~.C.IBM-850: C ! setlocales compliance ,IBM Linux.100+.setlocale.~.POSIX.IBM-850: POSIX ! setlocales compliance ,IBM -Linux.100+.setlocale.~.C.ISO-8859-1: C ! setlocales compliance ,IBM, HP, Sun , USL -Linux.100+.setlocale.~.POSIX.ISO-8859-1: POSIX ! setlocales compliance ,IBM, HP, Sun , USL +Linux.100+.setlocale.~.C.ISO-8859-1: C ! setlocales compliance ,IBM, HP, Sun , +Linux.100+.setlocale.~.POSIX.ISO-8859-1: POSIX ! setlocales compliance ,IBM, HP, Sun , ! W European/Americas, Latin 1 codeset -Linux.100+.setlocale.~.da_DK.ISO-8859-1: da_DK !.ISO8859-1 ! Danish, Denmark XoJIG,IBM, HP, , USL ("da") -Linux.100+.setlocale.>.de_AT.ISO-8859-1: de_DE !.ISO8859-1 ! German,Austria XoJIG, , , , USL -Linux.100+.setlocale.~.de_CH.ISO-8859-1: de_CH !.ISO8859-1 ! German,Switzerland XoJIG,IBM, , , USL -Linux.100+.setlocale.~.de_DE.ISO-8859-1: de_DE !.ISO8859-1 ! German, Germany XoJIG,IBM, HP, Sun ("de"), USL ("de") -Linux.100+.setlocale.>.en_AU.ISO-8859-1: en_GB !.ISO8859-1 ! English,Australia , , , , USL -Linux.100+.setlocale.>.en_CA.ISO-8859-1: en_US !.ISO8859-1 ! English,Canada XoJIG, , , , USL -Linux.100+.setlocale.>.en_DK.ISO-8859-1: en_GB !.ISO8859-1 ! English, Denmark XoJIG, , , , USL -Linux.100+.setlocale.~.en_GB.ISO-8859-1: en_GB !.ISO8859-1 ! English, U.K. XoJIG,IBM, HP, , USL ("en") +Linux.100+.setlocale.~.da_DK.ISO-8859-1: da_DK !.ISO8859-1 ! Danish, Denmark XoJIG,IBM, HP, , +Linux.100+.setlocale.>.de_AT.ISO-8859-1: de_DE !.ISO8859-1 ! German,Austria XoJIG, , , , + +Linux.100+.setlocale.~.de_CH.ISO-8859-1: de_CH !.ISO8859-1 ! German,Switzerland XoJIG,IBM, , , +Linux.100+.setlocale.~.de_DE.ISO-8859-1: de_DE !.ISO8859-1 ! German, Germany XoJIG,IBM, HP, Sun ("de"), +Linux.100+.setlocale.>.en_AU.ISO-8859-1: en_GB !.ISO8859-1 ! English,Australia , , , , +Linux.100+.setlocale.>.en_CA.ISO-8859-1: en_US !.ISO8859-1 ! English,Canada XoJIG, , , , +Linux.100+.setlocale.>.en_DK.ISO-8859-1: en_GB !.ISO8859-1 ! English, Denmark XoJIG, , , , +Linux.100+.setlocale.~.en_GB.ISO-8859-1: en_GB !.ISO8859-1 ! English, U.K. XoJIG,IBM, HP, , Linux.100+.setlocale.>.en_JP.ISO-8859-1: en_JP !.ISO8859-1 ! English, Japan XoJIG,IBM, , , Linux.100+.setlocale.>.en_JP.ISO-8859-1: en_US !.ISO8859-1 ! English, Japan XoJIG,IBM, , , -Linux.100+.setlocale.>.en_IE.ISO-8859-1: en_GB !.ISO8859-1 ! English, Ireland XoJIG, , , , USL -Linux.100+.setlocale.>.en_MY.ISO-8859-1: en_US !.ISO8859-1 ! English,Malaysia , , , , USL -Linux.100+.setlocale.>.en_NZ.ISO-8859-1: en_GB !.ISO8859-1 ! English,New Zealand , , , , USL -Linux.100+.setlocale.>.en_KR.ISO-8859-1: en_KR !.ISO8859-1 ! English,Korea , , , , USL +Linux.100+.setlocale.>.en_IE.ISO-8859-1: en_GB !.ISO8859-1 ! English, Ireland XoJIG, , , , +Linux.100+.setlocale.>.en_MY.ISO-8859-1: en_US !.ISO8859-1 ! English,Malaysia , , , , +Linux.100+.setlocale.>.en_NZ.ISO-8859-1: en_GB !.ISO8859-1 ! English,New Zealand , , , , +Linux.100+.setlocale.>.en_KR.ISO-8859-1: en_KR !.ISO8859-1 ! English,Korea , , , , Linux.100+.setlocale.>.en_KR.ISO-8859-1: en_US !.ISO8859-1 ! English,Korea ,IBM, , , -Linux.100+.setlocale.>.en_TW.ISO-8859-1: en_TW !.ISO8859-1 ! English,Taiwan , , , , USL +Linux.100+.setlocale.>.en_TW.ISO-8859-1: en_TW !.ISO8859-1 ! English,Taiwan , , , , Linux.100+.setlocale.>.en_TW.ISO-8859-1: en_US !.ISO8859-1 ! English,Taiwan ,IBM, , , -Linux.100+.setlocale.~.en_US.ISO-8859-1: en_US !.ISO8859-1 ! English, USA XoJIG,IBM, HP, Sun , USL -Linux.100+.setlocale.>.es_AR.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Argentina , , , Sun , USL +Linux.100+.setlocale.~.en_US.ISO-8859-1: en_US !.ISO8859-1 ! English, USA XoJIG,IBM, HP, Sun , +Linux.100+.setlocale.>.es_AR.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Argentina , , , Sun , Linux.100+.setlocale.>.es_BO.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Bolivia , , , Sun -Linux.100+.setlocale.>.es_CL.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Chile , , , Sun , USL +Linux.100+.setlocale.>.es_CL.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Chile , , , Sun , Linux.100+.setlocale.>.es_CO.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Columbia , , , Sun Linux.100+.setlocale.>.es_CR.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Costa Rica , , , Sun Linux.100+.setlocale.>.es_EC.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Ecuador , , , Sun -Linux.100+.setlocale.~.es_ES.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Spain XoJIG,IBM, HP, Sun , USL -Linux.100+.setlocale.~.ca_ES.ISO-8859-1: ca_ES !.ISO8859-1 ! Catalan, Spain XoJIG,IBM, HP, Sun , USL +Linux.100+.setlocale.~.es_ES.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Spain XoJIG,IBM, HP, Sun , +Linux.100+.setlocale.~.ca_ES.ISO-8859-1: ca_ES !.ISO8859-1 ! Catalan, Spain XoJIG,IBM, HP, Sun , Linux.100+.setlocale.>.es_GT.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Guatemala , , , Sun -Linux.100+.setlocale.>.es_MX.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Mexico , , , Sun , USL +Linux.100+.setlocale.>.es_MX.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Mexico , , , Sun , Linux.100+.setlocale.>.es_PE.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Peru , , , Sun Linux.100+.setlocale.>.es_UY.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Uruguay , , , Sun -Linux.100+.setlocale.>.es_VE.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Venezuela , , , Sun , USL +Linux.100+.setlocale.>.es_VE.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Venezuela , , , Sun , ! Linux.100+.setlocale.>.et_EE.ISO-8859-1: ! Estonian, Estonia XoJIG, -Linux.100+.setlocale.~.fi_FI.ISO-8859-1: fi_FI !.ISO8859-1 ! Finnish, Finland XoJIG,IBM, HP, , USL ("fi") +Linux.100+.setlocale.~.fi_FI.ISO-8859-1: fi_FI !.ISO8859-1 ! Finnish, Finland XoJIG,IBM, HP, , ! Linux.100+.setlocale.>.fo_FO.ISO-8859-1: ! Faroese, Faeroe Island XoJIG, -Linux.100+.setlocale.~.fr_BE.ISO-8859-1: fr_BE !.ISO8859-1 ! French,Belgium XoJIG, , , , USL -Linux.100+.setlocale.~.fr_CA.ISO-8859-1: fr_CA !.ISO8859-1 ! French, Canada XoJIG,IBM, HP, , USL -Linux.100+.setlocale.~.fr_CH.ISO-8859-1: fr_CH !.ISO8859-1 ! French, Switzerland XoJIG,IBM, , , USL -Linux.100+.setlocale.~.fr_FR.ISO-8859-1: fr_FR !.ISO8859-1 ! French, France XoJIG,IBM, HP, Sun ("fr"), USL ("fr") -Linux.100+.setlocale.~.is_IS.ISO-8859-1: is_IS !.ISO8859-1 ! Icelandic, Iceland XoJIG,IBM, HP, , USL ("is") -Linux.100+.setlocale.>.it_CH.ISO-8859-1: it_IT !.ISO8859-1 ! Italian,Switzerland , , , , USL -Linux.100+.setlocale.~.it_IT.ISO-8859-1: it_IT !.ISO8859-1 ! Italian, Italy XoJIG,IBM, HP, Sun ("it"), USL ("it") +Linux.100+.setlocale.~.fr_BE.ISO-8859-1: fr_BE !.ISO8859-1 ! French,Belgium XoJIG, , , , +Linux.100+.setlocale.~.fr_CA.ISO-8859-1: fr_CA !.ISO8859-1 ! French, Canada XoJIG,IBM, HP, , +Linux.100+.setlocale.~.fr_CH.ISO-8859-1: fr_CH !.ISO8859-1 ! French, Switzerland XoJIG,IBM, , , +Linux.100+.setlocale.~.fr_FR.ISO-8859-1: fr_FR !.ISO8859-1 ! French, France XoJIG,IBM, HP, Sun ("fr"), +Linux.100+.setlocale.~.is_IS.ISO-8859-1: is_IS !.ISO8859-1 ! Icelandic, Iceland XoJIG,IBM, HP, , +Linux.100+.setlocale.>.it_CH.ISO-8859-1: it_IT !.ISO8859-1 ! Italian,Switzerland , , , , +Linux.100+.setlocale.~.it_IT.ISO-8859-1: it_IT !.ISO8859-1 ! Italian, Italy XoJIG,IBM, HP, Sun ("it"), ! Linux.100+.setlocale.>.kl_GL.ISO-8859-1: ! Greenlandic, Greenland XoJIG, ! Linux.100+.setlocale.>.lt_LT.ISO-8859-1: ! Lithuanian, Lithuania XoJIG, ! Linux.100+.setlocale.>.lv_LV.ISO-8859-1: ! Latvian, Latvia XoJIG, -Linux.100+.setlocale.~.nl_BE.ISO-8859-1: nl_BE !.ISO8859-1 ! Dutch, Belgium XoJIG,IBM, , , USL -Linux.100+.setlocale.~.nl_NL.ISO-8859-1: nl_NL !.ISO8859-1 ! Dutch, The Netherlands XoJIG,IBM, HP, , USL ("nl") -Linux.100+.setlocale.~.no_NO.ISO-8859-1: no_NO !.ISO8859-1 ! Norwegian, Norway XoJIG,IBM, HP, , USL ("no") -Linux.100+.setlocale.~.pt_BR.ISO-8859-1: pt_BR !.ISO8859-1 ! Portuguese,Brazil , , , , USL -Linux.100+.setlocale.~.pt_PT.ISO-8859-1: pt_PT !.ISO8859-1 ! Portuguese, Portugal XoJIG,IBM, HP, , USL +Linux.100+.setlocale.~.nl_BE.ISO-8859-1: nl_BE !.ISO8859-1 ! Dutch, Belgium XoJIG,IBM, , , +Linux.100+.setlocale.~.nl_NL.ISO-8859-1: nl_NL !.ISO8859-1 ! Dutch, The Netherlands XoJIG,IBM, HP, , +Linux.100+.setlocale.~.no_NO.ISO-8859-1: no_NO !.ISO8859-1 ! Norwegian, Norway XoJIG,IBM, HP, , +Linux.100+.setlocale.~.pt_BR.ISO-8859-1: pt_BR !.ISO8859-1 ! Portuguese,Brazil , , , , +Linux.100+.setlocale.~.pt_PT.ISO-8859-1: pt_PT !.ISO8859-1 ! Portuguese, Portugal XoJIG,IBM, HP, , Linux.100+.setlocale.>.sv_FI.ISO-8859-1: sv_SE !.ISO8859-1 ! Swedish, Finland XoJIG, -Linux.100+.setlocale.~.sv_SE.ISO-8859-1: sv_SE !.ISO8859-1 ! Swedish, Sweden XoJIG,IBM, HP, Sun ("sv"), USL ("sv") +Linux.100+.setlocale.~.sv_SE.ISO-8859-1: sv_SE !.ISO8859-1 ! Swedish, Sweden XoJIG,IBM, HP, Sun ("sv"), ! E European @@ -298,14 +299,14 @@ Linux.100+.setlocale.~.el_GR.ISO-8859-7: el_GR !.ISO8859-7 ! Greek, Greece Linux.100+.setlocale.~.tr_TR.ISO-8859-9: tr_TR !.ISO8859-9 ! Turkish, Turkey ,IBM, HP ! East Asia -Linux.100+.setlocale.~.ja_JP.EUC-JP: ja_JP !.IBM-eucJP ! Japanese, Japan ,IBM, HP, Sun ("ja"), USL +Linux.100+.setlocale.~.ja_JP.EUC-JP: ja_JP !.IBM-eucJP ! Japanese, Japan ,IBM, HP, Sun ("ja"), Linux.100+.setlocale.~.ja_JP.IBM-932: Ja_JP !.IBM-932 ! Japanese, Japan ,IBM Linux.100+.setlocale.>.ja_JP.HP-SJIS: Ja_JP !.IBM-932 ! Japanese, Japan aka japanese 15 , , HP, -Linux.100+.setlocale.~.ko_KR.EUC-KR: ko_KR !.IBM-eucKR ! Korean, Korea ,IBM, HP, Sun ("ko"), USL -Linux.100+.setlocale.~.zh_CN.EUC-CN: zh_CN !.IBM-eucCN ! Chinese, China ,IBM, , Sun ("zh"), USL +Linux.100+.setlocale.~.ko_KR.EUC-KR: ko_KR !.IBM-eucKR ! Korean, Korea ,IBM, HP, Sun ("ko"), +Linux.100+.setlocale.~.zh_CN.EUC-CN: zh_CN !.IBM-eucCN ! Chinese, China ,IBM, , Sun ("zh"), Linux.100+.setlocale.>.zh_CN.HP-15CN: zh_CN !.IBM-eucCN ! Chinese, China , , HP Linux.100+.setlocale.~.zh_CN.UTF-8: ZH_CN !.UTF-8 ! Chinese, China ,IBM, -Linux.100+.setlocale.~.zh_TW.EUC-TW: zh_TW !.IBM-eucTW ! Chinese, Taiwan ,IBM, HP, Sun , USL +Linux.100+.setlocale.~.zh_TW.EUC-TW: zh_TW !.IBM-eucTW ! Chinese, Taiwan ,IBM, HP, Sun , Linux.100+.setlocale.>.zh_TW.HP-BIG5: Zh_TW !.big5 ! Chinese, Taiwan ,IBM, HP, , ! Linux.100+.setlocale.>.zh_TW.HP-CCDC: ! Chinese, Taiwan , , HP, , ! Linux.100+.setlocale.>.ja_JP.HP-KANA8: ! Japanese, Japan , , HP, , diff --git a/cde/lib/DtHelp/NetBSD.lcx b/cde/lib/DtHelp/NetBSD.lcx index 3f0bcb12..6c2c9dea 100644 --- a/cde/lib/DtHelp/NetBSD.lcx +++ b/cde/lib/DtHelp/NetBSD.lcx @@ -207,61 +207,61 @@ NetBSD.?.version.<.100: ".*" !! any CDE value ! setlocales Compliance NetBSD.100+.setlocale.~.C.IBM-850: C ! setlocales compliance ,IBM NetBSD.100+.setlocale.~.POSIX.IBM-850: POSIX ! setlocales compliance ,IBM -NetBSD.100+.setlocale.~.C.ISO-8859-1: C ! setlocales compliance ,IBM, HP, Sun , USL -NetBSD.100+.setlocale.~.POSIX.ISO-8859-1: POSIX ! setlocales compliance ,IBM, HP, Sun , USL +NetBSD.100+.setlocale.~.C.ISO-8859-1: C ! setlocales compliance ,IBM, HP, Sun , +NetBSD.100+.setlocale.~.POSIX.ISO-8859-1: POSIX ! setlocales compliance ,IBM, HP, Sun , ! W European/Americas, Latin 1 codeset -NetBSD.100+.setlocale.~.da_DK.ISO-8859-1: da_DK !.ISO8859-1 ! Danish, Denmark XoJIG,IBM, HP, , USL ("da") -NetBSD.100+.setlocale.>.de_AT.ISO-8859-1: de_DE !.ISO8859-1 ! German,Austria XoJIG, , , , USL -NetBSD.100+.setlocale.~.de_CH.ISO-8859-1: de_CH !.ISO8859-1 ! German,Switzerland XoJIG,IBM, , , USL -NetBSD.100+.setlocale.~.de_DE.ISO-8859-1: de_DE !.ISO8859-1 ! German, Germany XoJIG,IBM, HP, Sun ("de"), USL ("de") -NetBSD.100+.setlocale.>.en_AU.ISO-8859-1: en_GB !.ISO8859-1 ! English,Australia , , , , USL -NetBSD.100+.setlocale.>.en_CA.ISO-8859-1: en_US !.ISO8859-1 ! English,Canada XoJIG, , , , USL -NetBSD.100+.setlocale.>.en_DK.ISO-8859-1: en_GB !.ISO8859-1 ! English, Denmark XoJIG, , , , USL -NetBSD.100+.setlocale.~.en_GB.ISO-8859-1: en_GB !.ISO8859-1 ! English, U.K. XoJIG,IBM, HP, , USL ("en") +NetBSD.100+.setlocale.~.da_DK.ISO-8859-1: da_DK !.ISO8859-1 ! Danish, Denmark XoJIG,IBM, HP, , +NetBSD.100+.setlocale.>.de_AT.ISO-8859-1: de_DE !.ISO8859-1 ! German,Austria XoJIG, , , , +NetBSD.100+.setlocale.~.de_CH.ISO-8859-1: de_CH !.ISO8859-1 ! German,Switzerland XoJIG,IBM, , , +NetBSD.100+.setlocale.~.de_DE.ISO-8859-1: de_DE !.ISO8859-1 ! German, Germany XoJIG,IBM, HP, Sun ("de"), +NetBSD.100+.setlocale.>.en_AU.ISO-8859-1: en_GB !.ISO8859-1 ! English,Australia , , , , +NetBSD.100+.setlocale.>.en_CA.ISO-8859-1: en_US !.ISO8859-1 ! English,Canada XoJIG, , , , +NetBSD.100+.setlocale.>.en_DK.ISO-8859-1: en_GB !.ISO8859-1 ! English, Denmark XoJIG, , , , +NetBSD.100+.setlocale.~.en_GB.ISO-8859-1: en_GB !.ISO8859-1 ! English, U.K. XoJIG,IBM, HP, , NetBSD.100+.setlocale.>.en_JP.ISO-8859-1: en_JP !.ISO8859-1 ! English, Japan XoJIG,IBM, , , NetBSD.100+.setlocale.>.en_JP.ISO-8859-1: en_US !.ISO8859-1 ! English, Japan XoJIG,IBM, , , -NetBSD.100+.setlocale.>.en_IE.ISO-8859-1: en_GB !.ISO8859-1 ! English, Ireland XoJIG, , , , USL -NetBSD.100+.setlocale.>.en_MY.ISO-8859-1: en_US !.ISO8859-1 ! English,Malaysia , , , , USL -NetBSD.100+.setlocale.>.en_NZ.ISO-8859-1: en_GB !.ISO8859-1 ! English,New Zealand , , , , USL -NetBSD.100+.setlocale.>.en_KR.ISO-8859-1: en_KR !.ISO8859-1 ! English,Korea , , , , USL +NetBSD.100+.setlocale.>.en_IE.ISO-8859-1: en_GB !.ISO8859-1 ! English, Ireland XoJIG, , , , +NetBSD.100+.setlocale.>.en_MY.ISO-8859-1: en_US !.ISO8859-1 ! English,Malaysia , , , , +NetBSD.100+.setlocale.>.en_NZ.ISO-8859-1: en_GB !.ISO8859-1 ! English,New Zealand , , , , +NetBSD.100+.setlocale.>.en_KR.ISO-8859-1: en_KR !.ISO8859-1 ! English,Korea , , , , NetBSD.100+.setlocale.>.en_KR.ISO-8859-1: en_US !.ISO8859-1 ! English,Korea ,IBM, , , -NetBSD.100+.setlocale.>.en_TW.ISO-8859-1: en_TW !.ISO8859-1 ! English,Taiwan , , , , USL +NetBSD.100+.setlocale.>.en_TW.ISO-8859-1: en_TW !.ISO8859-1 ! English,Taiwan , , , , NetBSD.100+.setlocale.>.en_TW.ISO-8859-1: en_US !.ISO8859-1 ! English,Taiwan ,IBM, , , -NetBSD.100+.setlocale.~.en_US.ISO-8859-1: en_US !.ISO8859-1 ! English, USA XoJIG,IBM, HP, Sun , USL -NetBSD.100+.setlocale.>.es_AR.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Argentina , , , Sun , USL +NetBSD.100+.setlocale.~.en_US.ISO-8859-1: en_US !.ISO8859-1 ! English, USA XoJIG,IBM, HP, Sun , +NetBSD.100+.setlocale.>.es_AR.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Argentina , , , Sun , NetBSD.100+.setlocale.>.es_BO.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Bolivia , , , Sun -NetBSD.100+.setlocale.>.es_CL.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Chile , , , Sun , USL +NetBSD.100+.setlocale.>.es_CL.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Chile , , , Sun , NetBSD.100+.setlocale.>.es_CO.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Columbia , , , Sun NetBSD.100+.setlocale.>.es_CR.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Costa Rica , , , Sun NetBSD.100+.setlocale.>.es_EC.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Ecuador , , , Sun -NetBSD.100+.setlocale.~.es_ES.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Spain XoJIG,IBM, HP, Sun , USL -NetBSD.100+.setlocale.~.ca_ES.ISO-8859-1: ca_ES !.ISO8859-1 ! Catalan, Spain XoJIG,IBM, HP, Sun , USL +NetBSD.100+.setlocale.~.es_ES.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Spain XoJIG,IBM, HP, Sun , +NetBSD.100+.setlocale.~.ca_ES.ISO-8859-1: ca_ES !.ISO8859-1 ! Catalan, Spain XoJIG,IBM, HP, Sun , NetBSD.100+.setlocale.>.es_GT.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Guatemala , , , Sun -NetBSD.100+.setlocale.>.es_MX.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Mexico , , , Sun , USL +NetBSD.100+.setlocale.>.es_MX.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Mexico , , , Sun , NetBSD.100+.setlocale.>.es_PE.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Peru , , , Sun NetBSD.100+.setlocale.>.es_UY.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Uruguay , , , Sun -NetBSD.100+.setlocale.>.es_VE.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Venezuela , , , Sun , USL +NetBSD.100+.setlocale.>.es_VE.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Venezuela , , , Sun , ! NetBSD.100+.setlocale.>.et_EE.ISO-8859-1: ! Estonian, Estonia XoJIG, -NetBSD.100+.setlocale.~.fi_FI.ISO-8859-1: fi_FI !.ISO8859-1 ! Finnish, Finland XoJIG,IBM, HP, , USL ("fi") +NetBSD.100+.setlocale.~.fi_FI.ISO-8859-1: fi_FI !.ISO8859-1 ! Finnish, Finland XoJIG,IBM, HP, , ! NetBSD.100+.setlocale.>.fo_FO.ISO-8859-1: ! Faroese, Faeroe Island XoJIG, -NetBSD.100+.setlocale.~.fr_BE.ISO-8859-1: fr_BE !.ISO8859-1 ! French,Belgium XoJIG, , , , USL -NetBSD.100+.setlocale.~.fr_CA.ISO-8859-1: fr_CA !.ISO8859-1 ! French, Canada XoJIG,IBM, HP, , USL -NetBSD.100+.setlocale.~.fr_CH.ISO-8859-1: fr_CH !.ISO8859-1 ! French, Switzerland XoJIG,IBM, , , USL -NetBSD.100+.setlocale.~.fr_FR.ISO-8859-1: fr_FR !.ISO8859-1 ! French, France XoJIG,IBM, HP, Sun ("fr"), USL ("fr") -NetBSD.100+.setlocale.~.is_IS.ISO-8859-1: is_IS !.ISO8859-1 ! Icelandic, Iceland XoJIG,IBM, HP, , USL ("is") -NetBSD.100+.setlocale.>.it_CH.ISO-8859-1: it_IT !.ISO8859-1 ! Italian,Switzerland , , , , USL -NetBSD.100+.setlocale.~.it_IT.ISO-8859-1: it_IT !.ISO8859-1 ! Italian, Italy XoJIG,IBM, HP, Sun ("it"), USL ("it") +NetBSD.100+.setlocale.~.fr_BE.ISO-8859-1: fr_BE !.ISO8859-1 ! French,Belgium XoJIG, , , , +NetBSD.100+.setlocale.~.fr_CA.ISO-8859-1: fr_CA !.ISO8859-1 ! French, Canada XoJIG,IBM, HP, , +NetBSD.100+.setlocale.~.fr_CH.ISO-8859-1: fr_CH !.ISO8859-1 ! French, Switzerland XoJIG,IBM, , , +NetBSD.100+.setlocale.~.fr_FR.ISO-8859-1: fr_FR !.ISO8859-1 ! French, France XoJIG,IBM, HP, Sun ("fr"), +NetBSD.100+.setlocale.~.is_IS.ISO-8859-1: is_IS !.ISO8859-1 ! Icelandic, Iceland XoJIG,IBM, HP, , +NetBSD.100+.setlocale.>.it_CH.ISO-8859-1: it_IT !.ISO8859-1 ! Italian,Switzerland , , , , +NetBSD.100+.setlocale.~.it_IT.ISO-8859-1: it_IT !.ISO8859-1 ! Italian, Italy XoJIG,IBM, HP, Sun ("it"), ! NetBSD.100+.setlocale.>.kl_GL.ISO-8859-1: ! Greenlandic, Greenland XoJIG, ! NetBSD.100+.setlocale.>.lt_LT.ISO-8859-1: ! Lithuanian, Lithuania XoJIG, ! NetBSD.100+.setlocale.>.lv_LV.ISO-8859-1: ! Latvian, Latvia XoJIG, -NetBSD.100+.setlocale.~.nl_BE.ISO-8859-1: nl_BE !.ISO8859-1 ! Dutch, Belgium XoJIG,IBM, , , USL -NetBSD.100+.setlocale.~.nl_NL.ISO-8859-1: nl_NL !.ISO8859-1 ! Dutch, The Netherlands XoJIG,IBM, HP, , USL ("nl") -NetBSD.100+.setlocale.~.no_NO.ISO-8859-1: no_NO !.ISO8859-1 ! Norwegian, Norway XoJIG,IBM, HP, , USL ("no") -NetBSD.100+.setlocale.~.pt_BR.ISO-8859-1: pt_BR !.ISO8859-1 ! Portuguese,Brazil , , , , USL -NetBSD.100+.setlocale.~.pt_PT.ISO-8859-1: pt_PT !.ISO8859-1 ! Portuguese, Portugal XoJIG,IBM, HP, , USL +NetBSD.100+.setlocale.~.nl_BE.ISO-8859-1: nl_BE !.ISO8859-1 ! Dutch, Belgium XoJIG,IBM, , , +NetBSD.100+.setlocale.~.nl_NL.ISO-8859-1: nl_NL !.ISO8859-1 ! Dutch, The Netherlands XoJIG,IBM, HP, , +NetBSD.100+.setlocale.~.no_NO.ISO-8859-1: no_NO !.ISO8859-1 ! Norwegian, Norway XoJIG,IBM, HP, , +NetBSD.100+.setlocale.~.pt_BR.ISO-8859-1: pt_BR !.ISO8859-1 ! Portuguese,Brazil , , , , +NetBSD.100+.setlocale.~.pt_PT.ISO-8859-1: pt_PT !.ISO8859-1 ! Portuguese, Portugal XoJIG,IBM, HP, , NetBSD.100+.setlocale.>.sv_FI.ISO-8859-1: sv_SE !.ISO8859-1 ! Swedish, Finland XoJIG, -NetBSD.100+.setlocale.~.sv_SE.ISO-8859-1: sv_SE !.ISO8859-1 ! Swedish, Sweden XoJIG,IBM, HP, Sun ("sv"), USL ("sv") +NetBSD.100+.setlocale.~.sv_SE.ISO-8859-1: sv_SE !.ISO8859-1 ! Swedish, Sweden XoJIG,IBM, HP, Sun ("sv"), ! E European @@ -298,14 +298,14 @@ NetBSD.100+.setlocale.~.el_GR.ISO-8859-7: el_GR !.ISO8859-7 ! Greek, Greece NetBSD.100+.setlocale.~.tr_TR.ISO-8859-9: tr_TR !.ISO8859-9 ! Turkish, Turkey ,IBM, HP ! East Asia -NetBSD.100+.setlocale.~.ja_JP.EUC-JP: ja_JP !.IBM-eucJP ! Japanese, Japan ,IBM, HP, Sun ("ja"), USL +NetBSD.100+.setlocale.~.ja_JP.EUC-JP: ja_JP !.IBM-eucJP ! Japanese, Japan ,IBM, HP, Sun ("ja"), NetBSD.100+.setlocale.~.ja_JP.IBM-932: Ja_JP !.IBM-932 ! Japanese, Japan ,IBM NetBSD.100+.setlocale.>.ja_JP.HP-SJIS: Ja_JP !.IBM-932 ! Japanese, Japan aka japanese 15 , , HP, -NetBSD.100+.setlocale.~.ko_KR.EUC-KR: ko_KR !.IBM-eucKR ! Korean, Korea ,IBM, HP, Sun ("ko"), USL -NetBSD.100+.setlocale.~.zh_CN.EUC-CN: zh_CN !.IBM-eucCN ! Chinese, China ,IBM, , Sun ("zh"), USL +NetBSD.100+.setlocale.~.ko_KR.EUC-KR: ko_KR !.IBM-eucKR ! Korean, Korea ,IBM, HP, Sun ("ko"), +NetBSD.100+.setlocale.~.zh_CN.EUC-CN: zh_CN !.IBM-eucCN ! Chinese, China ,IBM, , Sun ("zh"), NetBSD.100+.setlocale.>.zh_CN.HP-15CN: zh_CN !.IBM-eucCN ! Chinese, China , , HP NetBSD.100+.setlocale.~.zh_CN.UTF-8: ZH_CN !.UTF-8 ! Chinese, China ,IBM, -NetBSD.100+.setlocale.~.zh_TW.EUC-TW: zh_TW !.IBM-eucTW ! Chinese, Taiwan ,IBM, HP, Sun , USL +NetBSD.100+.setlocale.~.zh_TW.EUC-TW: zh_TW !.IBM-eucTW ! Chinese, Taiwan ,IBM, HP, Sun , NetBSD.100+.setlocale.>.zh_TW.HP-BIG5: Zh_TW !.big5 ! Chinese, Taiwan ,IBM, HP, , ! NetBSD.100+.setlocale.>.zh_TW.HP-CCDC: ! Chinese, Taiwan , , HP, , ! NetBSD.100+.setlocale.>.ja_JP.HP-KANA8: ! Japanese, Japan , , HP, , diff --git a/cde/lib/DtHelp/OSF1.lcx b/cde/lib/DtHelp/OSF1.lcx index 421b38ab..8a04a50a 100644 --- a/cde/lib/DtHelp/OSF1.lcx +++ b/cde/lib/DtHelp/OSF1.lcx @@ -244,58 +244,58 @@ OSF1.?.version.<.300: "[A-Z]3\\..*" ! setlocales Compliance -OSF1.400+.setlocale.~.C.ISO-8859-1: C ! setlocales compliance ,IBM, HP, Sun , USL -OSF1.400+.setlocale.~.POSIX.ISO-8859-1: POSIX ! setlocales compliance ,IBM, HP, Sun , USL +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, , USL ("da") -OSF1.400+.setlocale.>.de_AT.ISO-8859-1: de_DE.ISO8859-1 ! German,Austria XoJIG, , , , USL -OSF1.400+.setlocale.~.de_CH.ISO-8859-1: de_CH.ISO8859-1 ! German,Switzerland XoJIG,IBM, , , USL -OSF1.400+.setlocale.~.de_DE.ISO-8859-1: de_DE.ISO8859-1 ! German, Germany XoJIG,IBM, HP, Sun ("de"), USL ("de") -OSF1.400+.setlocale.>.en_AU.ISO-8859-1: en_GB.ISO8859-1 ! English,Australia , , , , USL -OSF1.400+.setlocale.>.en_CA.ISO-8859-1: en_US.ISO8859-1 ! English,Canada XoJIG, , , , USL -OSF1.400+.setlocale.>.en_DK.ISO-8859-1: en_GB.ISO8859-1 ! English, Denmark XoJIG, , , , USL -OSF1.400+.setlocale.~.en_GB.ISO-8859-1: en_GB.ISO8859-1 ! English, U.K. XoJIG,IBM, HP, , USL ("en") +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, , , , USL -OSF1.400+.setlocale.>.en_MY.ISO-8859-1: en_US.ISO8859-1 ! English,Malaysia , , , , USL -OSF1.400+.setlocale.>.en_NZ.ISO-8859-1: en_GB.ISO8859-1 ! English,New Zealand , , , , USL -OSF1.400+.setlocale.>.en_KR.ISO-8859-1: en_US.ISO8859-1 ! English,Korea , , , , USL -OSF1.400+.setlocale.>.en_TW.ISO-8859-1: en_US.ISO8859-1 ! English,Taiwan , , , , USL -OSF1.400+.setlocale.~.en_US.ISO-8859-1: en_US.ISO8859-1 ! English, USA XoJIG,IBM, HP, Sun , USL -OSF1.400+.setlocale.>.es_AR.ISO-8859-1: es_ES.ISO8859-1 ! Spanish, Argentina , , , Sun , USL +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 , USL +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 , USL -OSF1.400+.setlocale.~.ca_ES.ISO-8859-1: ca_ES.ISO8859-1 ! Catalan, Spain XoJIG,IBM, HP, Sun , USL, DEC +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 , USL +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 , USL +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, , USL ("fi") +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, , , , USL -OSF1.400+.setlocale.~.fr_CA.ISO-8859-1: fr_CA.ISO8859-1 ! French, Canada XoJIG,IBM, HP, , USL -OSF1.400+.setlocale.~.fr_CH.ISO-8859-1: fr_CH.ISO8859-1 ! French, Switzerland XoJIG,IBM, , , USL -OSF1.400+.setlocale.~.fr_FR.ISO-8859-1: fr_FR.ISO8859-1 ! French, France XoJIG,IBM, HP, Sun ("fr"), USL ("fr") -OSF1.400+.setlocale.~.is_IS.ISO-8859-1: is_IS.ISO8859-1 ! Icelandic, Iceland XoJIG,IBM, HP, , USL ("is") -OSF1.400+.setlocale.>.it_CH.ISO-8859-1: it_IT.ISO8859-1 ! Italian,Switzerland , , , , USL -OSF1.400+.setlocale.~.it_IT.ISO-8859-1: it_IT.ISO8859-1 ! Italian, Italy XoJIG,IBM, HP, Sun ("it"), USL ("it") +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, , , USL -OSF1.400+.setlocale.~.nl_NL.ISO-8859-1: nl_NL.ISO8859-1 ! Dutch, The Netherlands XoJIG,IBM, HP, , USL ("nl") -OSF1.400+.setlocale.~.no_NO.ISO-8859-1: no_NO.ISO8859-1 ! Norwegian, Norway XoJIG,IBM, HP, , USL ("no") -OSF1.400+.setlocale.>.pt_BR.ISO-8859-1: pt_PT.ISO8859-1 ! Portuguese,Brazil , , , , USL -OSF1.400+.setlocale.~.pt_PT.ISO-8859-1: pt_PT.ISO8859-1 ! Portuguese, Portugal XoJIG,IBM, HP, , USL +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"), USL ("sv") +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 @@ -332,17 +332,17 @@ OSF1.400+.setlocale.~.el_GR.ISO-8859-7: el_GR.ISO8859-7 ! Greek, Greece 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"), USL +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"), USL +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 , USL +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 diff --git a/cde/lib/DtHelp/OpenBSD.lcx b/cde/lib/DtHelp/OpenBSD.lcx index 7fe99cfc..a83d159c 100644 --- a/cde/lib/DtHelp/OpenBSD.lcx +++ b/cde/lib/DtHelp/OpenBSD.lcx @@ -207,61 +207,61 @@ OpenBSD.?.version.<.100: ".*" !! any CDE value ! setlocales Compliance OpenBSD.100+.setlocale.~.C.IBM-850: C ! setlocales compliance ,IBM OpenBSD.100+.setlocale.~.POSIX.IBM-850: POSIX ! setlocales compliance ,IBM -OpenBSD.100+.setlocale.~.C.ISO-8859-1: C ! setlocales compliance ,IBM, HP, Sun , USL -OpenBSD.100+.setlocale.~.POSIX.ISO-8859-1: POSIX ! setlocales compliance ,IBM, HP, Sun , USL +OpenBSD.100+.setlocale.~.C.ISO-8859-1: C ! setlocales compliance ,IBM, HP, Sun , +OpenBSD.100+.setlocale.~.POSIX.ISO-8859-1: POSIX ! setlocales compliance ,IBM, HP, Sun , ! W European/Americas, Latin 1 codeset -OpenBSD.100+.setlocale.~.da_DK.ISO-8859-1: da_DK !.ISO8859-1 ! Danish, Denmark XoJIG,IBM, HP, , USL ("da") -OpenBSD.100+.setlocale.>.de_AT.ISO-8859-1: de_DE !.ISO8859-1 ! German,Austria XoJIG, , , , USL -OpenBSD.100+.setlocale.~.de_CH.ISO-8859-1: de_CH !.ISO8859-1 ! German,Switzerland XoJIG,IBM, , , USL -OpenBSD.100+.setlocale.~.de_DE.ISO-8859-1: de_DE !.ISO8859-1 ! German, Germany XoJIG,IBM, HP, Sun ("de"), USL ("de") -OpenBSD.100+.setlocale.>.en_AU.ISO-8859-1: en_GB !.ISO8859-1 ! English,Australia , , , , USL -OpenBSD.100+.setlocale.>.en_CA.ISO-8859-1: en_US !.ISO8859-1 ! English,Canada XoJIG, , , , USL -OpenBSD.100+.setlocale.>.en_DK.ISO-8859-1: en_GB !.ISO8859-1 ! English, Denmark XoJIG, , , , USL -OpenBSD.100+.setlocale.~.en_GB.ISO-8859-1: en_GB !.ISO8859-1 ! English, U.K. XoJIG,IBM, HP, , USL ("en") +OpenBSD.100+.setlocale.~.da_DK.ISO-8859-1: da_DK !.ISO8859-1 ! Danish, Denmark XoJIG,IBM, HP, , +OpenBSD.100+.setlocale.>.de_AT.ISO-8859-1: de_DE !.ISO8859-1 ! German,Austria XoJIG, , , , +OpenBSD.100+.setlocale.~.de_CH.ISO-8859-1: de_CH !.ISO8859-1 ! German,Switzerland XoJIG,IBM, , , +OpenBSD.100+.setlocale.~.de_DE.ISO-8859-1: de_DE !.ISO8859-1 ! German, Germany XoJIG,IBM, HP, Sun ("de"), +OpenBSD.100+.setlocale.>.en_AU.ISO-8859-1: en_GB !.ISO8859-1 ! English,Australia , , , , +OpenBSD.100+.setlocale.>.en_CA.ISO-8859-1: en_US !.ISO8859-1 ! English,Canada XoJIG, , , , +OpenBSD.100+.setlocale.>.en_DK.ISO-8859-1: en_GB !.ISO8859-1 ! English, Denmark XoJIG, , , , +OpenBSD.100+.setlocale.~.en_GB.ISO-8859-1: en_GB !.ISO8859-1 ! English, U.K. XoJIG,IBM, HP, , OpenBSD.100+.setlocale.>.en_JP.ISO-8859-1: en_JP !.ISO8859-1 ! English, Japan XoJIG,IBM, , , OpenBSD.100+.setlocale.>.en_JP.ISO-8859-1: en_US !.ISO8859-1 ! English, Japan XoJIG,IBM, , , -OpenBSD.100+.setlocale.>.en_IE.ISO-8859-1: en_GB !.ISO8859-1 ! English, Ireland XoJIG, , , , USL -OpenBSD.100+.setlocale.>.en_MY.ISO-8859-1: en_US !.ISO8859-1 ! English,Malaysia , , , , USL -OpenBSD.100+.setlocale.>.en_NZ.ISO-8859-1: en_GB !.ISO8859-1 ! English,New Zealand , , , , USL -OpenBSD.100+.setlocale.>.en_KR.ISO-8859-1: en_KR !.ISO8859-1 ! English,Korea , , , , USL +OpenBSD.100+.setlocale.>.en_IE.ISO-8859-1: en_GB !.ISO8859-1 ! English, Ireland XoJIG, , , , +OpenBSD.100+.setlocale.>.en_MY.ISO-8859-1: en_US !.ISO8859-1 ! English,Malaysia , , , , +OpenBSD.100+.setlocale.>.en_NZ.ISO-8859-1: en_GB !.ISO8859-1 ! English,New Zealand , , , , +OpenBSD.100+.setlocale.>.en_KR.ISO-8859-1: en_KR !.ISO8859-1 ! English,Korea , , , , OpenBSD.100+.setlocale.>.en_KR.ISO-8859-1: en_US !.ISO8859-1 ! English,Korea ,IBM, , , -OpenBSD.100+.setlocale.>.en_TW.ISO-8859-1: en_TW !.ISO8859-1 ! English,Taiwan , , , , USL +OpenBSD.100+.setlocale.>.en_TW.ISO-8859-1: en_TW !.ISO8859-1 ! English,Taiwan , , , , OpenBSD.100+.setlocale.>.en_TW.ISO-8859-1: en_US !.ISO8859-1 ! English,Taiwan ,IBM, , , -OpenBSD.100+.setlocale.~.en_US.ISO-8859-1: en_US !.ISO8859-1 ! English, USA XoJIG,IBM, HP, Sun , USL -OpenBSD.100+.setlocale.>.es_AR.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Argentina , , , Sun , USL +OpenBSD.100+.setlocale.~.en_US.ISO-8859-1: en_US !.ISO8859-1 ! English, USA XoJIG,IBM, HP, Sun , +OpenBSD.100+.setlocale.>.es_AR.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Argentina , , , Sun , OpenBSD.100+.setlocale.>.es_BO.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Bolivia , , , Sun -OpenBSD.100+.setlocale.>.es_CL.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Chile , , , Sun , USL +OpenBSD.100+.setlocale.>.es_CL.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Chile , , , Sun , OpenBSD.100+.setlocale.>.es_CO.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Columbia , , , Sun OpenBSD.100+.setlocale.>.es_CR.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Costa Rica , , , Sun OpenBSD.100+.setlocale.>.es_EC.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Ecuador , , , Sun -OpenBSD.100+.setlocale.~.es_ES.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Spain XoJIG,IBM, HP, Sun , USL -OpenBSD.100+.setlocale.~.ca_ES.ISO-8859-1: ca_ES !.ISO8859-1 ! Catalan, Spain XoJIG,IBM, HP, Sun , USL +OpenBSD.100+.setlocale.~.es_ES.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Spain XoJIG,IBM, HP, Sun , +OpenBSD.100+.setlocale.~.ca_ES.ISO-8859-1: ca_ES !.ISO8859-1 ! Catalan, Spain XoJIG,IBM, HP, Sun , OpenBSD.100+.setlocale.>.es_GT.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Guatemala , , , Sun -OpenBSD.100+.setlocale.>.es_MX.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Mexico , , , Sun , USL +OpenBSD.100+.setlocale.>.es_MX.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Mexico , , , Sun , OpenBSD.100+.setlocale.>.es_PE.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Peru , , , Sun OpenBSD.100+.setlocale.>.es_UY.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Uruguay , , , Sun -OpenBSD.100+.setlocale.>.es_VE.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Venezuela , , , Sun , USL +OpenBSD.100+.setlocale.>.es_VE.ISO-8859-1: es_ES !.ISO8859-1 ! Spanish, Venezuela , , , Sun , ! OpenBSD.100+.setlocale.>.et_EE.ISO-8859-1: ! Estonian, Estonia XoJIG, -OpenBSD.100+.setlocale.~.fi_FI.ISO-8859-1: fi_FI !.ISO8859-1 ! Finnish, Finland XoJIG,IBM, HP, , USL ("fi") +OpenBSD.100+.setlocale.~.fi_FI.ISO-8859-1: fi_FI !.ISO8859-1 ! Finnish, Finland XoJIG,IBM, HP, , ! OpenBSD.100+.setlocale.>.fo_FO.ISO-8859-1: ! Faroese, Faeroe Island XoJIG, -OpenBSD.100+.setlocale.~.fr_BE.ISO-8859-1: fr_BE !.ISO8859-1 ! French,Belgium XoJIG, , , , USL -OpenBSD.100+.setlocale.~.fr_CA.ISO-8859-1: fr_CA !.ISO8859-1 ! French, Canada XoJIG,IBM, HP, , USL -OpenBSD.100+.setlocale.~.fr_CH.ISO-8859-1: fr_CH !.ISO8859-1 ! French, Switzerland XoJIG,IBM, , , USL -OpenBSD.100+.setlocale.~.fr_FR.ISO-8859-1: fr_FR !.ISO8859-1 ! French, France XoJIG,IBM, HP, Sun ("fr"), USL ("fr") -OpenBSD.100+.setlocale.~.is_IS.ISO-8859-1: is_IS !.ISO8859-1 ! Icelandic, Iceland XoJIG,IBM, HP, , USL ("is") -OpenBSD.100+.setlocale.>.it_CH.ISO-8859-1: it_IT !.ISO8859-1 ! Italian,Switzerland , , , , USL -OpenBSD.100+.setlocale.~.it_IT.ISO-8859-1: it_IT !.ISO8859-1 ! Italian, Italy XoJIG,IBM, HP, Sun ("it"), USL ("it") +OpenBSD.100+.setlocale.~.fr_BE.ISO-8859-1: fr_BE !.ISO8859-1 ! French,Belgium XoJIG, , , , +OpenBSD.100+.setlocale.~.fr_CA.ISO-8859-1: fr_CA !.ISO8859-1 ! French, Canada XoJIG,IBM, HP, , +OpenBSD.100+.setlocale.~.fr_CH.ISO-8859-1: fr_CH !.ISO8859-1 ! French, Switzerland XoJIG,IBM, , , +OpenBSD.100+.setlocale.~.fr_FR.ISO-8859-1: fr_FR !.ISO8859-1 ! French, France XoJIG,IBM, HP, Sun ("fr"), +OpenBSD.100+.setlocale.~.is_IS.ISO-8859-1: is_IS !.ISO8859-1 ! Icelandic, Iceland XoJIG,IBM, HP, , +OpenBSD.100+.setlocale.>.it_CH.ISO-8859-1: it_IT !.ISO8859-1 ! Italian,Switzerland , , , , +OpenBSD.100+.setlocale.~.it_IT.ISO-8859-1: it_IT !.ISO8859-1 ! Italian, Italy XoJIG,IBM, HP, Sun ("it"), ! OpenBSD.100+.setlocale.>.kl_GL.ISO-8859-1: ! Greenlandic, Greenland XoJIG, ! OpenBSD.100+.setlocale.>.lt_LT.ISO-8859-1: ! Lithuanian, Lithuania XoJIG, ! OpenBSD.100+.setlocale.>.lv_LV.ISO-8859-1: ! Latvian, Latvia XoJIG, -OpenBSD.100+.setlocale.~.nl_BE.ISO-8859-1: nl_BE !.ISO8859-1 ! Dutch, Belgium XoJIG,IBM, , , USL -OpenBSD.100+.setlocale.~.nl_NL.ISO-8859-1: nl_NL !.ISO8859-1 ! Dutch, The Netherlands XoJIG,IBM, HP, , USL ("nl") -OpenBSD.100+.setlocale.~.no_NO.ISO-8859-1: no_NO !.ISO8859-1 ! Norwegian, Norway XoJIG,IBM, HP, , USL ("no") -OpenBSD.100+.setlocale.~.pt_BR.ISO-8859-1: pt_BR !.ISO8859-1 ! Portuguese,Brazil , , , , USL -OpenBSD.100+.setlocale.~.pt_PT.ISO-8859-1: pt_PT !.ISO8859-1 ! Portuguese, Portugal XoJIG,IBM, HP, , USL +OpenBSD.100+.setlocale.~.nl_BE.ISO-8859-1: nl_BE !.ISO8859-1 ! Dutch, Belgium XoJIG,IBM, , , +OpenBSD.100+.setlocale.~.nl_NL.ISO-8859-1: nl_NL !.ISO8859-1 ! Dutch, The Netherlands XoJIG,IBM, HP, , +OpenBSD.100+.setlocale.~.no_NO.ISO-8859-1: no_NO !.ISO8859-1 ! Norwegian, Norway XoJIG,IBM, HP, , +OpenBSD.100+.setlocale.~.pt_BR.ISO-8859-1: pt_BR !.ISO8859-1 ! Portuguese,Brazil , , , , +OpenBSD.100+.setlocale.~.pt_PT.ISO-8859-1: pt_PT !.ISO8859-1 ! Portuguese, Portugal XoJIG,IBM, HP, , OpenBSD.100+.setlocale.>.sv_FI.ISO-8859-1: sv_SE !.ISO8859-1 ! Swedish, Finland XoJIG, -OpenBSD.100+.setlocale.~.sv_SE.ISO-8859-1: sv_SE !.ISO8859-1 ! Swedish, Sweden XoJIG,IBM, HP, Sun ("sv"), USL ("sv") +OpenBSD.100+.setlocale.~.sv_SE.ISO-8859-1: sv_SE !.ISO8859-1 ! Swedish, Sweden XoJIG,IBM, HP, Sun ("sv"), ! E European @@ -298,14 +298,14 @@ OpenBSD.100+.setlocale.~.el_GR.ISO-8859-7: el_GR !.ISO8859-7 ! Greek, Greece OpenBSD.100+.setlocale.~.tr_TR.ISO-8859-9: tr_TR !.ISO8859-9 ! Turkish, Turkey ,IBM, HP ! East Asia -OpenBSD.100+.setlocale.~.ja_JP.EUC-JP: ja_JP !.IBM-eucJP ! Japanese, Japan ,IBM, HP, Sun ("ja"), USL +OpenBSD.100+.setlocale.~.ja_JP.EUC-JP: ja_JP !.IBM-eucJP ! Japanese, Japan ,IBM, HP, Sun ("ja"), OpenBSD.100+.setlocale.~.ja_JP.IBM-932: Ja_JP !.IBM-932 ! Japanese, Japan ,IBM OpenBSD.100+.setlocale.>.ja_JP.HP-SJIS: Ja_JP !.IBM-932 ! Japanese, Japan aka japanese 15 , , HP, -OpenBSD.100+.setlocale.~.ko_KR.EUC-KR: ko_KR !.IBM-eucKR ! Korean, Korea ,IBM, HP, Sun ("ko"), USL -OpenBSD.100+.setlocale.~.zh_CN.EUC-CN: zh_CN !.IBM-eucCN ! Chinese, China ,IBM, , Sun ("zh"), USL +OpenBSD.100+.setlocale.~.ko_KR.EUC-KR: ko_KR !.IBM-eucKR ! Korean, Korea ,IBM, HP, Sun ("ko"), +OpenBSD.100+.setlocale.~.zh_CN.EUC-CN: zh_CN !.IBM-eucCN ! Chinese, China ,IBM, , Sun ("zh"), OpenBSD.100+.setlocale.>.zh_CN.HP-15CN: zh_CN !.IBM-eucCN ! Chinese, China , , HP OpenBSD.100+.setlocale.~.zh_CN.UTF-8: ZH_CN !.UTF-8 ! Chinese, China ,IBM, -OpenBSD.100+.setlocale.~.zh_TW.EUC-TW: zh_TW !.IBM-eucTW ! Chinese, Taiwan ,IBM, HP, Sun , USL +OpenBSD.100+.setlocale.~.zh_TW.EUC-TW: zh_TW !.IBM-eucTW ! Chinese, Taiwan ,IBM, HP, Sun , OpenBSD.100+.setlocale.>.zh_TW.HP-BIG5: Zh_TW !.big5 ! Chinese, Taiwan ,IBM, HP, , ! OpenBSD.100+.setlocale.>.zh_TW.HP-CCDC: ! Chinese, Taiwan , , HP, , ! OpenBSD.100+.setlocale.>.ja_JP.HP-KANA8: ! Japanese, Japan , , HP, , diff --git a/cde/lib/DtHelp/StringFuncs.c b/cde/lib/DtHelp/StringFuncs.c index d5c280f5..30e48e36 100644 --- a/cde/lib/DtHelp/StringFuncs.c +++ b/cde/lib/DtHelp/StringFuncs.c @@ -51,7 +51,7 @@ #include #include /* getlocale(), LOCALE_STATUS, LC_xxx */ -#if defined(_AIX) || defined(USL) || defined(CSRG_BASED) +#if defined(_AIX) || defined(CSRG_BASED) #include #endif @@ -533,7 +533,7 @@ int _DtHelpCeStrHashToKey( #endif extern int strcoll(const char *,const char *); -#if defined(_AIX) || defined(USL) +#if defined(_AIX) extern int _DtHelpCeStrCaseCmp(const char *,const char *); #else extern int strcasecmp(const char *,const char *); @@ -553,7 +553,7 @@ int _DtHelpCeStrHashToKey( #endif if (Clang) -#if defined(_AIX) || defined(USL) +#if defined(_AIX) return _DtHelpCeStrCaseCmp; #else return strcasecmp; @@ -1048,7 +1048,7 @@ int _DtHelpCeIconvContextSuitable( } -#if defined(_AIX) || defined (USL) +#if defined(_AIX) /***************************************************************************** * Function: _DtHelpCeStrCaseCmp * @@ -1056,7 +1056,7 @@ int _DtHelpCeIconvContextSuitable( * * Return Value: * - * Purpose: IBM and USL do not support the 'strcasecmp' routine. This takes it's + * Purpose: IBM does not support the 'strcasecmp' routine. This takes it's * place. *****************************************************************************/ int @@ -1066,7 +1066,7 @@ _DtHelpCeStrCaseCmp ( { return (_DtCvStrCaseCmp(s1, s2)); } -#endif /* _AIX or USL */ +#endif /* _AIX */ /****************************************************************************** * Function: int _DtHelpCeFreeStringArray (char **array) diff --git a/cde/lib/DtHelp/StringFuncsI.h b/cde/lib/DtHelp/StringFuncsI.h index 00877de4..ba3b2bef 100644 --- a/cde/lib/DtHelp/StringFuncsI.h +++ b/cde/lib/DtHelp/StringFuncsI.h @@ -56,9 +56,9 @@ typedef struct _DtHelpCeIconvContextRec * _DtHelpCeIconvContext; /**************************************************************************** * Semi Public Re-defines ****************************************************************************/ -#if !defined(_AIX) && !defined(USL) +#if !defined(_AIX) #define _DtHelpCeStrCaseCmp(s1,s2) strcasecmp(s1,s2) -#endif /* _AIX or USL */ +#endif /* _AIX */ /**************************************************************************** * Semi Public Routines @@ -223,11 +223,11 @@ extern int _DtHelpCeCountChars ( int max_len, int *ret_len ); extern int _DtHelpCeFreeStringArray ( char **array); -#if defined(_AIX) || defined(USL) +#if defined(_AIX) extern int _DtHelpCeStrCaseCmp( const char *s1, const char *s2); -#endif /* _AIX or USL */ +#endif /* _AIX */ extern int _DtHelpCeStrCaseCmpLatin1( const char *s1, const char *s2); diff --git a/cde/lib/DtHelp/SunOS.lcx b/cde/lib/DtHelp/SunOS.lcx index 88b1d4d2..5d36df71 100644 --- a/cde/lib/DtHelp/SunOS.lcx +++ b/cde/lib/DtHelp/SunOS.lcx @@ -225,90 +225,90 @@ SunOS.?.version.<.500: "5\\..*" ! ---- - --------- ! setlocales Compliance -SunOS.520+.setlocale.=.C.ISO-8859-1: C ! setlocales compliance ,IBM, HP, Sun , USL -SunOS.520+.setlocale.~.POSIX.ISO-8859-1: POSIX ! setlocales compliance ,IBM, HP, Sun , USL +SunOS.520+.setlocale.=.C.ISO-8859-1: C ! setlocales compliance ,IBM, HP, Sun , +SunOS.520+.setlocale.~.POSIX.ISO-8859-1: POSIX ! setlocales compliance ,IBM, HP, Sun , ! W European/Americas, Latin 1 codeset -SunOS.520+.setlocale.>.da_DK.ISO-8859-1: de ! Danish, Denmark XoJIG,IBM, HP, , USL ("da") - -SunOS.520+.setlocale.>.de_AT.ISO-8859-1: de ! German,Austria XoJIG, , , , USL -SunOS.520+.setlocale.>.de_CH.ISO-8859-1: de ! German,Switzerland XoJIG,IBM, , , USL -SunOS.520+.setlocale.~.de_DE.ISO-8859-1: de ! German, Germany XoJIG,IBM, HP, Sun ("de"), USL ("de") -SunOS.520-539.setlocale.>.en_AU.ISO-8859-1: en ! English,Australia , , , , USL -SunOS.540+.setlocale.>.en_AU.ISO-8859-1: en_US ! English,Australia , , , , USL -SunOS.520-539.setlocale.>.en_CA.ISO-8859-1: en ! English,Canada XoJIG, , , , USL -SunOS.540+.setlocale.>.en_CA.ISO-8859-1: en_US ! English,Canada XoJIG, , , , USL -SunOS.520-539.setlocale.>.en_DK.ISO-8859-1: en ! English, Denmark XoJIG, , , , USL -SunOS.540+.setlocale.>.en_DK.ISO-8859-1: en_US ! English, Denmark XoJIG, , , , USL -SunOS.520-539.setlocale.>.en_GB.ISO-8859-1: en ! English, U.K. XoJIG,IBM, HP, , USL ("en") -SunOS.540+.setlocale.>.en_GB.ISO-8859-1: en_US ! English, U.K. XoJIG,IBM, HP, , USL ("en") +SunOS.520+.setlocale.>.da_DK.ISO-8859-1: de ! Danish, Denmark XoJIG,IBM, HP, , + +SunOS.520+.setlocale.>.de_AT.ISO-8859-1: de ! German,Austria XoJIG, , , , +SunOS.520+.setlocale.>.de_CH.ISO-8859-1: de ! German,Switzerland XoJIG,IBM, , , +SunOS.520+.setlocale.~.de_DE.ISO-8859-1: de ! German, Germany XoJIG,IBM, HP, Sun ("de"), +SunOS.520-539.setlocale.>.en_AU.ISO-8859-1: en ! English,Australia , , , , +SunOS.540+.setlocale.>.en_AU.ISO-8859-1: en_US ! English,Australia , , , , +SunOS.520-539.setlocale.>.en_CA.ISO-8859-1: en ! English,Canada XoJIG, , , , +SunOS.540+.setlocale.>.en_CA.ISO-8859-1: en_US ! English,Canada XoJIG, , , , +SunOS.520-539.setlocale.>.en_DK.ISO-8859-1: en ! English, Denmark XoJIG, , , , +SunOS.540+.setlocale.>.en_DK.ISO-8859-1: en_US ! English, Denmark XoJIG, , , , +SunOS.520-539.setlocale.>.en_GB.ISO-8859-1: en ! English, U.K. XoJIG,IBM, HP, , +SunOS.540+.setlocale.>.en_GB.ISO-8859-1: en_US ! English, U.K. XoJIG,IBM, HP, , SunOS.520-539.setlocale.>.en_JP.ISO-8859-1: en ! English, Japan XoJIG,IBM, , , SunOS.540+.setlocale.>.en_JP.ISO-8859-1: en_US ! English, Japan XoJIG,IBM, , , -SunOS.520-539.setlocale.>.en_IE.ISO-8859-1: en ! English, Ireland XoJIG, , , , USL -SunOS.540+.setlocale.>.en_IE.ISO-8859-1: en_US ! English, Ireland XoJIG, , , , USL -SunOS.520-539.setlocale.>.en_MY.ISO-8859-1: en ! English,Malaysia , , , , USL -SunOS.540+.setlocale.>.en_MY.ISO-8859-1: en_US ! English,Malaysia , , , , USL -SunOS.520-539.setlocale.>.en_NZ.ISO-8859-1: en ! English,New Zealand , , , , USL -SunOS.540+.setlocale.>.en_NZ.ISO-8859-1: en_US ! English,New Zealand , , , , USL -SunOS.520-539.setlocale.>.en_KR.ISO-8859-1: en ! English,Korea , , , , USL -SunOS.540+.setlocale.>.en_KR.ISO-8859-1: en_US ! English,Korea , , , , USL -SunOS.520-539.setlocale.>.en_TW.ISO-8859-1: en ! English,Taiwan , , , , USL -SunOS.540+.setlocale.>.en_TW.ISO-8859-1: en_US ! English,Taiwan , , , , USL -SunOS.520-539.setlocale.~.en_US.ISO-8859-1: en ! English, USA XoJIG,IBM, HP, , USL -SunOS.540+.setlocale.~.en_US.ISO-8859-1: en_US ! English, USA XoJIG,IBM, HP, , USL +SunOS.520-539.setlocale.>.en_IE.ISO-8859-1: en ! English, Ireland XoJIG, , , , +SunOS.540+.setlocale.>.en_IE.ISO-8859-1: en_US ! English, Ireland XoJIG, , , , +SunOS.520-539.setlocale.>.en_MY.ISO-8859-1: en ! English,Malaysia , , , , +SunOS.540+.setlocale.>.en_MY.ISO-8859-1: en_US ! English,Malaysia , , , , +SunOS.520-539.setlocale.>.en_NZ.ISO-8859-1: en ! English,New Zealand , , , , +SunOS.540+.setlocale.>.en_NZ.ISO-8859-1: en_US ! English,New Zealand , , , , +SunOS.520-539.setlocale.>.en_KR.ISO-8859-1: en ! English,Korea , , , , +SunOS.540+.setlocale.>.en_KR.ISO-8859-1: en_US ! English,Korea , , , , +SunOS.520-539.setlocale.>.en_TW.ISO-8859-1: en ! English,Taiwan , , , , +SunOS.540+.setlocale.>.en_TW.ISO-8859-1: en_US ! English,Taiwan , , , , +SunOS.520-539.setlocale.~.en_US.ISO-8859-1: en ! English, USA XoJIG,IBM, HP, , +SunOS.540+.setlocale.~.en_US.ISO-8859-1: en_US ! English, USA XoJIG,IBM, HP, , SunOS.520-529.setlocale.>.es_AR.ISO-8859-1: es ! Spanish, Argentina , , , Sun SunOS.530+.setlocale.~.es_AR.ISO-8859-1: es_AR ! Spanish, Argentina , , , Sun SunOS.520-529.setlocale.>.es_BO.ISO-8859-1: es ! Spanish, Bolivia , , , Sun SunOS.530+.setlocale.~.es_BO.ISO-8859-1: es_BO ! Spanish, Bolivia , , , Sun -SunOS.520-529.setlocale.>.es_CL.ISO-8859-1: es ! Spanish, Chile , , , Sun , USL -SunOS.530+.setlocale.~.es_CL.ISO-8859-1: es_CL ! Spanish, Chile , , , Sun , USL +SunOS.520-529.setlocale.>.es_CL.ISO-8859-1: es ! Spanish, Chile , , , Sun , +SunOS.530+.setlocale.~.es_CL.ISO-8859-1: es_CL ! Spanish, Chile , , , Sun , SunOS.520-529.setlocale.>.es_CO.ISO-8859-1: es ! Spanish, Columbia , , , Sun SunOS.530+.setlocale.~.es_CO.ISO-8859-1: es_CO ! Spanish, Columbia , , , Sun SunOS.520-529.setlocale.>.es_CR.ISO-8859-1: es ! Spanish, Costa Rica , , , Sun SunOS.530+.setlocale.~.es_CR.ISO-8859-1: es_CR ! Spanish, Costa Rica , , , Sun SunOS.520-529.setlocale.>.es_EC.ISO-8859-1: es ! Spanish, Ecuador , , , Sun SunOS.530+.setlocale.~.es_EC.ISO-8859-1: es_EC ! Spanish, Ecuador , , , Sun -SunOS.520+.setlocale.~.es_ES.ISO-8859-1: es ! Spanish, Spain XoJIG,IBM, HP, Sun , USL +SunOS.520+.setlocale.~.es_ES.ISO-8859-1: es ! Spanish, Spain XoJIG,IBM, HP, Sun , SunOS.520-529.setlocale.>.es_GT.ISO-8859-1: es ! Spanish, Guatemala , , , Sun SunOS.530+.setlocale.~.es_GT.ISO-8859-1: es_GT ! Spanish, Guatemala , , , Sun -SunOS.520-529.setlocale.>.es_MX.ISO-8859-1: es ! Spanish, Mexico , , , Sun , USL -SunOS.530+.setlocale.~.es_MX.ISO-8859-1: es_MX ! Spanish, Mexico , , , Sun , USL +SunOS.520-529.setlocale.>.es_MX.ISO-8859-1: es ! Spanish, Mexico , , , Sun , +SunOS.530+.setlocale.~.es_MX.ISO-8859-1: es_MX ! Spanish, Mexico , , , Sun , SunOS.520-529.setlocale.>.es_PE.ISO-8859-1: es ! Spanish, Peru , , , Sun SunOS.530+.setlocale.~.es_PE.ISO-8859-1: es_PE ! Spanish, Peru , , , Sun SunOS.520-529.setlocale.>.es_UY.ISO-8859-1: es ! Spanish, Uruguay , , , Sun SunOS.530+.setlocale.~.es_UY.ISO-8859-1: es_UY ! Spanish, Uruguay , , , Sun -SunOS.520-529.setlocale.>.es_VE.ISO-8859-1: es ! Spanish, Venezuela , , , Sun , USL -SunOS.530+.setlocale.~.es_VE.ISO-8859-1: es_VE ! Spanish, Venezuela , , , Sun , USL +SunOS.520-529.setlocale.>.es_VE.ISO-8859-1: es ! Spanish, Venezuela , , , Sun , +SunOS.530+.setlocale.~.es_VE.ISO-8859-1: es_VE ! Spanish, Venezuela , , , Sun , ! SunOS.520+.setlocale.>.et_EE.ISO-8859-1: ! Estonian, Estonia XoJIG, -! SunOS.520+.setlocale.>.fi_FI.ISO-8859-1: ! Finnish, Finland XoJIG,IBM, HP, , USL ("fi") +! SunOS.520+.setlocale.>.fi_FI.ISO-8859-1: ! Finnish, Finland XoJIG,IBM, HP, , ! SunOS.520+.setlocale.>.fo_FO.ISO-8859-1: ! Faroese, Faeroe Island XoJIG, -SunOS.520+.setlocale.>.fr_BE.ISO-8859-1: fr ! French,Belgium XoJIG, , , , USL -SunOS.520+.setlocale.>.fr_CA.ISO-8859-1: fr ! French, Canada XoJIG,IBM, HP, , USL -SunOS.520+.setlocale.>.fr_CH.ISO-8859-1: fr ! French, Switzerland XoJIG,IBM, , , USL -SunOS.520+.setlocale.~.fr_FR.ISO-8859-1: fr ! French, France XoJIG,IBM, HP, Sun ("fr"), USL ("fr") -!SunOS.520+.setlocale.>.is_IS.ISO-8859-1: ! Icelandic, Iceland XoJIG,IBM, HP, , USL ("is") -SunOS.520+.setlocale.>.it_CH.ISO-8859-1: it ! Italian,Switzerland , , , , USL -SunOS.520+.setlocale.~.it_IT.ISO-8859-1: it ! Italian, Italy XoJIG,IBM, HP, Sun ("it"), USL ("it") +SunOS.520+.setlocale.>.fr_BE.ISO-8859-1: fr ! French,Belgium XoJIG, , , , +SunOS.520+.setlocale.>.fr_CA.ISO-8859-1: fr ! French, Canada XoJIG,IBM, HP, , +SunOS.520+.setlocale.>.fr_CH.ISO-8859-1: fr ! French, Switzerland XoJIG,IBM, , , +SunOS.520+.setlocale.~.fr_FR.ISO-8859-1: fr ! French, France XoJIG,IBM, HP, Sun ("fr"), +!SunOS.520+.setlocale.>.is_IS.ISO-8859-1: ! Icelandic, Iceland XoJIG,IBM, HP, , +SunOS.520+.setlocale.>.it_CH.ISO-8859-1: it ! Italian,Switzerland , , , , +SunOS.520+.setlocale.~.it_IT.ISO-8859-1: it ! Italian, Italy XoJIG,IBM, HP, Sun ("it"), !SunOS.520+.setlocale.>.kl_GL.ISO-8859-1: ! Greenlandic, Greenland XoJIG, !SunOS.520+.setlocale.>.lt_LT.ISO-8859-1: ! Lithuanian, Lithuania XoJIG, !SunOS.520+.setlocale.>.lv_LV.ISO-8859-1: ! Latvian, Latvia XoJIG, -SunOS.520+.setlocale.>.nl_BE.ISO-8859-1: ge ! Dutch, Belgium XoJIG,IBM, , , USL -!SunOS.520+.setlocale.>.nl_BE.ISO-8859-1: nl_BE ! Dutch, Belgium XoJIG,IBM, , , USL -SunOS.520+.setlocale.>.nl_NL.ISO-8859-1: ge ! Dutch, The Netherlands XoJIG,IBM, HP, , USL ("nl") -!SunOS.520+.setlocale.>.nl_NL.ISO-8859-1: nl ! Dutch, The Netherlands XoJIG,IBM, HP, , USL ("nl") -SunOS.520+.setlocale.>.no_NO.ISO-8859-1: ge ! Norwegian, Norway XoJIG,IBM, HP, , USL ("no") -!SunOS.520+.setlocale.>.no_NO.ISO-8859-1: no ! Norwegian, Norway XoJIG,IBM, HP, , USL ("no") +SunOS.520+.setlocale.>.nl_BE.ISO-8859-1: ge ! Dutch, Belgium XoJIG,IBM, , , +!SunOS.520+.setlocale.>.nl_BE.ISO-8859-1: nl_BE ! Dutch, Belgium XoJIG,IBM, , , +SunOS.520+.setlocale.>.nl_NL.ISO-8859-1: ge ! Dutch, The Netherlands XoJIG,IBM, HP, , +!SunOS.520+.setlocale.>.nl_NL.ISO-8859-1: nl ! Dutch, The Netherlands XoJIG,IBM, HP, , +SunOS.520+.setlocale.>.no_NO.ISO-8859-1: ge ! Norwegian, Norway XoJIG,IBM, HP, , +!SunOS.520+.setlocale.>.no_NO.ISO-8859-1: no ! Norwegian, Norway XoJIG,IBM, HP, , -SunOS.520+.setlocale.>.pt_BR.ISO-8859-1: es ! Portuguese,Brazil , , , , USL -!SunOS.520+.setlocale.>.pt_BR.ISO-8859-1: pt ! Portuguese,Brazil , , , , USL +SunOS.520+.setlocale.>.pt_BR.ISO-8859-1: es ! Portuguese,Brazil , , , , +!SunOS.520+.setlocale.>.pt_BR.ISO-8859-1: pt ! Portuguese,Brazil , , , , -SunOS.520+.setlocale.>.pt_PT.ISO-8859-1: pt ! Portuguese, Portugal XoJIG,IBM, HP, , USL +SunOS.520+.setlocale.>.pt_PT.ISO-8859-1: pt ! Portuguese, Portugal XoJIG,IBM, HP, , SunOS.520+.setlocale.>.sv_FI.ISO-8859-1: sv ! Swedish, Finland XoJIG, -SunOS.520+.setlocale.~.sv_SE.ISO-8859-1: sv ! Swedish, Sweden XoJIG,IBM, HP, Sun ("sv"), USL ("sv") +SunOS.520+.setlocale.~.sv_SE.ISO-8859-1: sv ! Swedish, Sweden XoJIG,IBM, HP, Sun ("sv"), ! E European @@ -343,16 +343,16 @@ SunOS.520+.setlocale.~.sv_SE.ISO-8859-1: sv ! Swedish, Sweden ! SunOS.520+.setlocale.>.tr_TR.ISO-8859-9: ! Turkish, Turkey ,IBM, HP ! East Asia -SunOS.520+.setlocale.~.ja_JP.EUC-JP: ja ! Japanese, Japan ,IBM, HP, Sun ("ja"), USL +SunOS.520+.setlocale.~.ja_JP.EUC-JP: ja ! Japanese, Japan ,IBM, HP, Sun ("ja"), ! Commented out the above line because the following 2 are needed ! so that ja and japanese refer to the same common Japanese locale name. -! SunOS.520+.setlocale.=.ja_JP.EUC-JP: ja ! Japanese, Japan ,IBM, HP, Sun ("ja"), USL -SunOS.520+.setlocale.=.ja_JP.EUC-JP: japanese ! Japanese, Japan ,IBM, HP, Sun ("ja"), USL -SunOS.520+.setlocale.~.ja_JP.SJIS: ja_JP.SJIS ! Japanese, Japan ,IBM, HP, Sun ("ja"), USL -SunOS.520+.setlocale.~.ko_KR.EUC-KR: ko ! Korean, Korea ,IBM, HP, Sun ("ko"), USL -SunOS.520+.setlocale.~.zh_CN.EUC-CN: zh ! Chinese, China ,IBM, , Sun ("zh"), USL -SunOS.520.setlocale.~.zh_TW.EUC-TW: zh_TW ! Chinese, Taiwan ,IBM, HP, Sun , USL -SunOS.530+.setlocale.~.zh_TW.EUC-TW: zh_TW ! Chinese, Taiwan ,IBM, HP, Sun , USL +! SunOS.520+.setlocale.=.ja_JP.EUC-JP: ja ! Japanese, Japan ,IBM, HP, Sun ("ja"), +SunOS.520+.setlocale.=.ja_JP.EUC-JP: japanese ! Japanese, Japan ,IBM, HP, Sun ("ja"), +SunOS.520+.setlocale.~.ja_JP.SJIS: ja_JP.SJIS ! Japanese, Japan ,IBM, HP, Sun ("ja"), +SunOS.520+.setlocale.~.ko_KR.EUC-KR: ko ! Korean, Korea ,IBM, HP, Sun ("ko"), +SunOS.520+.setlocale.~.zh_CN.EUC-CN: zh ! Chinese, China ,IBM, , Sun ("zh"), +SunOS.520.setlocale.~.zh_TW.EUC-TW: zh_TW ! Chinese, Taiwan ,IBM, HP, Sun , +SunOS.530+.setlocale.~.zh_TW.EUC-TW: zh_TW ! Chinese, Taiwan ,IBM, HP, Sun , SunOS.520+.setlocale.>.zh_CN.HP-15CN: zh ! Chinese, China , , HP ! SunOS.520+.setlocale.0.zh_TW.HP-BIG5: ! Chinese, Taiwan , , HP, , ! SunOS.520+.setlocale.>.zh_TW.HP-CCDC: ! Chinese, Taiwan , , HP, , diff --git a/cde/lib/DtHelp/UNIX_SV.lcx b/cde/lib/DtHelp/UNIX_SV.lcx deleted file mode 100644 index 1f7c64fb..00000000 --- a/cde/lib/DtHelp/UNIX_SV.lcx +++ /dev/null @@ -1,517 +0,0 @@ -! -! (c) Copyright 1993, 1994 Hewlett-Packard Company -! (c) Copyright 1993, 1994 International Business Machines Corp. -! (c) Copyright 1993, 1994, 1995 Sun Microsystems, Inc. -! (c) Copyright 1993, 1994 Novell, Inc. -! -!!!!!!!!!!!!!! UNIX_SV Locale-Related Translations !!!!!!!!!!!!!! -! File: UNIX_SV.lcx -! Default location: /usr/dt/config/svc/UNIX_SV.lcx -! Purpose: -! Define the UNIX_SV (UnixWare) 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 UNIX_SV 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: UNIX_SV.lcx /main/3 1996/10/26 11:34:34 rws $ -! 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 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. -! Because there is no way to turn off a translation marked -! with .0. once it is specified, the preferred method of -! indicating that a translation is not supported --at the moment-- -! is just to comment out the translation rather than use .0. -! -! Standard values: -! ================ -! _DtLcx defines the order of the standard values in the -! translations it utilizes. All translation specifications -! must adhere to this order. -! .. -! In CDE 1.0, no modifiers are standardized and that -! portion of the table is unspecified. This means -! that no CDE standard modifiers are available across -! platforms. Operations that use only the -! should specify the wildcard character ("?") for the -! value. -! -! Operation-specific value: -! ========================= -! The operation-specific value is a string that is used -! according to the kind of translation. The syntax is -! : -! or : "", 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. -! -!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - -! uncomment this resource to debug/test translation -!*debugDtXlate: True - -!!!!!!!!!!!!!!!! UNIX_SV (UnixWare) 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. -!!! -UNIX_SV.?.version.<.200: "4\\.2MP2\\..*" - - -!!!!!!!!!!!!!!!! UNIX_SV (UnixWare) 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 UnixWare 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 -UNIX_SV.200+.setlocale.=.C.ISO-8859-1: C ! setlocales compliance ,IBM, HP, Sun , USL, UXP -UNIX_SV.200+.setlocale.=.POSIX.ISO-8859-1: POSIX ! setlocales compliance ,IBM, HP, Sun , USL, UXP - -! W European/Americas, Latin 1 codeset -UNIX_SV.200+.setlocale.=.da_DK.ISO-8859-1: da ! Danish, Denmark XoJIG,IBM, HP, , USL ("da") -UNIX_SV.200+.setlocale.=.de_AT.ISO-8859-1: de_AT ! German,Austria XoJIG, , , , USL -UNIX_SV.200+.setlocale.=.de_CH.ISO-8859-1: de_CH ! German,Switzerland XoJIG,IBM, , , USL -UNIX_SV.200+.setlocale.=.de_DE.ISO-8859-1: de ! German, Germany XoJIG,IBM, HP, Sun ("de"), USL ("de") -UNIX_SV.200+.setlocale.=.en_AU.ISO-8859-1: en_AU ! English,Australia , , , , USL -UNIX_SV.200+.setlocale.=.en_CA.ISO-8859-1: en_CA ! English,Canada XoJIG, , , , USL -UNIX_SV.200+.setlocale.>.en_DK.ISO-8859-1: en ! English, Denmark XoJIG, , , , USL -UNIX_SV.200+.setlocale.>.en_DK.ISO-8859-1: en_US ! English, Denmark XoJIG, , , , USL -UNIX_SV.200+.setlocale.=.en_GB.ISO-8859-1: en_GB ! English, U.K. XoJIG,IBM, HP, , USL ("en") -UNIX_SV.200+.setlocale.>.en_JP.ISO-8859-1: en ! English, Japan XoJIG,IBM, , , -UNIX_SV.200+.setlocale.>.en_JP.ISO-8859-1: en_US ! English, Japan XoJIG,IBM, , , -UNIX_SV.200+.setlocale.=.en_IE.ISO-8859-1: en_IR ! English, Ireland XoJIG, , , , USL -UNIX_SV.200+.setlocale.>.en_MY.ISO-8859-1: en ! English,Malaysia , , , , USL -UNIX_SV.200+.setlocale.>.en_MY.ISO-8859-1: en_US ! English,Malaysia , , , , USL -UNIX_SV.200+.setlocale.=.en_NZ.ISO-8859-1: en_NZ ! English,New Zealand , , , , USL -UNIX_SV.200+.setlocale.>.en_KR.ISO-8859-1: en ! English,Korea , , , , USL -UNIX_SV.200+.setlocale.>.en_KR.ISO-8859-1: en_US ! English,Korea , , , , USL -UNIX_SV.200+.setlocale.>.en_TW.ISO-8859-1: en ! English,Taiwan , , , , USL -UNIX_SV.200+.setlocale.>.en_TW.ISO-8859-1: en_US ! English,Taiwan , , , , USL -UNIX_SV.200+.setlocale.=.en_US.ISO-8859-1: en ! English, USA XoJIG,IBM, HP, , USL -UNIX_SV.200+.setlocale.=.en_US.ISO-8859-1: en_US ! English, USA XoJIG,IBM, HP, , USL - -UNIX_SV.200+.setlocale.=.es_AR.ISO-8859-1: es_AR ! Spanish, Argentina , , , Sun -UNIX_SV.200+.setlocale.>.es_BO.ISO-8859-1: es ! Spanish, Bolivia , , , Sun -UNIX_SV.200+.setlocale.=.es_CL.ISO-8859-1: es_CL ! Spanish, Chile , , , Sun , USL -UNIX_SV.200+.setlocale.>.es_CO.ISO-8859-1: es ! Spanish, Columbia , , , Sun -UNIX_SV.200+.setlocale.>.es_CR.ISO-8859-1: es ! Spanish, Costa Rica , , , Sun -UNIX_SV.200+.setlocale.>.es_EC.ISO-8859-1: es ! Spanish, Ecuador , , , Sun -UNIX_SV.200+.setlocale.=.es_ES.ISO-8859-1: es ! Spanish, Spain XoJIG,IBM, HP, Sun , USL -UNIX_SV.200+.setlocale.>.es_GT.ISO-8859-1: es ! Spanish, Guatemala , , , Sun -UNIX_SV.200+.setlocale.=.es_MX.ISO-8859-1: es_MX ! Spanish, Mexico , , , Sun , USL -UNIX_SV.200+.setlocale.>.es_PE.ISO-8859-1: es ! Spanish, Peru , , , Sun -UNIX_SV.200+.setlocale.>.es_UY.ISO-8859-1: es ! Spanish, Uruguay , , , Sun -UNIX_SV.200+.setlocale.=.es_VE.ISO-8859-1: es_VE ! Spanish, Venezuela , , , Sun , USL -! UNIX_SV.200+.setlocale.>.et_EE.ISO-8859-1: ! Estonian, Estonia XoJIG, -UNIX_SV.200+.setlocale.=.fi_FI.ISO-8859-1: fi ! Finnish, Finland XoJIG,IBM, HP, , USL ("fi") -! UNIX_SV.200+.setlocale.>.fo_FO.ISO-8859-1: ! Faroese, Faeroe Island XoJIG, -UNIX_SV.200+.setlocale.=.fr_BE.ISO-8859-1: fr_BE ! French,Belgium XoJIG, , , , USL -UNIX_SV.200+.setlocale.=.fr_CA.ISO-8859-1: fr_CA ! French, Canada XoJIG,IBM, HP, , USL -UNIX_SV.200+.setlocale.=.fr_CH.ISO-8859-1: fr_CH ! French, Switzerland XoJIG,IBM, , , USL -UNIX_SV.200+.setlocale.=.fr_FR.ISO-8859-1: fr ! French, France XoJIG,IBM, HP, Sun ("fr"), USL ("fr") -UNIX_SV.200+.setlocale.=.is_IS.ISO-8859-1: is ! Icelandic, Iceland XoJIG,IBM, HP, , USL ("is") -UNIX_SV.200+.setlocale.=.it_CH.ISO-8859-1: it_CH ! Italian,Switzerland , , , , USL -UNIX_SV.200+.setlocale.=.it_IT.ISO-8859-1: it ! Italian, Italy XoJIG,IBM, HP, Sun ("it"), USL ("it") -! UNIX_SV.200+.setlocale.>.kl_GL.ISO-8859-1: ! Greenlandic, Greenland XoJIG, -! UNIX_SV.200+.setlocale.>.lt_LT.ISO-8859-1: ! Lithuanian, Lithuania XoJIG, -! UNIX_SV.200+.setlocale.>.lv_LV.ISO-8859-1: ! Latvian, Latvia XoJIG, -UNIX_SV.200+.setlocale.=.nl_BE.ISO-8859-1: nl_BE ! Dutch, Belgium XoJIG,IBM, , , USL -UNIX_SV.200+.setlocale.=.nl_NL.ISO-8859-1: nl ! Dutch, The Netherlands XoJIG,IBM, HP, , USL ("nl") -UNIX_SV.200+.setlocale.=.no_NO.ISO-8859-1: no ! Norwegian, Norway XoJIG,IBM, HP, , USL ("no") -UNIX_SV.200+.setlocale.=.pt_BR.ISO-8859-1: pt_BR ! Portuguese,Brazil , , , , USL -UNIX_SV.200+.setlocale.=.pt_PT.ISO-8859-1: pt ! Portuguese, Portugal XoJIG,IBM, HP, , USL -UNIX_SV.200+.setlocale.=.sv_FI.ISO-8859-1: sv_FI ! Swedish, Finland XoJIG, -UNIX_SV.200+.setlocale.=.sv_SE.ISO-8859-1: sv ! Swedish, Sweden XoJIG,IBM, HP, Sun ("sv"), USL ("sv") - -! E European -! UNIX_SV.200+.setlocale.>.cs_CS.ISO-8859-2: ! Czech(1) ,IBM, HP -! UNIX_SV.200+.setlocale.>.hr_HR.ISO-8859-2: ! Croatian, Croatia ,IBM -! UNIX_SV.200+.setlocale.>.hu_HU.ISO-8859-2: ! Hungarian, Hungry XoJIG,IBM, HP -! UNIX_SV.200+.setlocale.>.pl_PL.ISO-8859-2: ! Polish, Poland XoJIG,IBM, HP -! UNIX_SV.200+.setlocale.>.ro_RO.ISO-8859-2: ! Rumanian, Romania XoJIG,IBM, HP -! UNIX_SV.200+.setlocale.>.sh_YU.ISO-8859-2: ! Serbocroatian, Yugoslavia(1) ,IBM, HP -! UNIX_SV.200+.setlocale.>.sl_CS.ISO-8859-2: ! Slovenian , , HP -! UNIX_SV.200+.setlocale.>.si_SI.ISO-8859-2: ! Slovenian ,IBM, -! UNIX_SV.200+.setlocale.>.sk_SK.ISO-8859-2: ! Slovak ,IBM - -! Cyrillic -! UNIX_SV.200+.setlocale.>.bg_BG.ISO-8859-5: ! Bulgarian, Bulgaria ,IBM, HP -! UNIX_SV.200+.setlocale.>.mk_MK.ISO-8859-5: ! Macedonian ,IBM -! UNIX_SV.200+.setlocale.>.ru_RU.ISO-8859-5: ! Russian(1) ,IBM, -! UNIX_SV.200+.setlocale.>.ru_SU.ISO-8859-5: ! Russian(1) , , HP -! UNIX_SV.200+.setlocale.>.sp_YU.ISO-8859-5: ! Serbian,Yugoslavia(1) ,IBM - -! Arabic -! UNIX_SV.200+.setlocale.>.ar_DZ.ISO-8859-6: ! Arabic(2) , , HP -! UNIX_SV.200+.setlocale.>.ar_SA.ISO-8859-6: ! Arabic(2) , , HP - -! Hebrew -! UNIX_SV.200+.setlocale.>.iw_IL.ISO-8859-8: ! Hebrew, Israel ,IBM, HP - -! Greek -! UNIX_SV.200+.setlocale.>.el_GR.ISO-8859-7: ! Greek, Greece ,IBM, HP - -! Turkish -! UNIX_SV.200+.setlocale.>.tr_TR.ISO-8859-9: ! Turkish, Turkey ,IBM, HP - -! East Asia -UNIX_SV.200+.setlocale.~.ja_JP.EUC-JP: ja ! Japanese, Japan ,IBM, HP, Sun ("ja"), USL, UXP -UNIX_SV.200+.setlocale.=.ja_JP.SJIS: ! Japanese, Japan ,IBM, HP, Sun ("ja"), USL, UXP -! UNIX_SV.200+.setlocale.~.ko_KR.EUC-KR: ! Korean, Korea ,IBM, HP, Sun ("ko"), USL -! UNIX_SV.200+.setlocale.~.zh_CN.EUC-CN: ! Chinese, China ,IBM, , Sun ("zh"), USL -! UNIX_SV.200.setlocale.~.zh_TW.EUC-TW: ! Chinese, Taiwan ,IBM, HP, Sun , USL -! UNIX_SV.200+.setlocale.~.zh_TW.EUC-TW: ! Chinese, Taiwan ,IBM, HP, Sun , USL -! UNIX_SV.200+.setlocale.>.zh_CN.HP-15CN: ! Chinese, China , , HP -! UNIX_SV.200+.setlocale.0.zh_TW.HP-BIG5: ! Chinese, Taiwan , , HP, , -! UNIX_SV.200+.setlocale.>.zh_TW.HP-CCDC: ! Chinese, Taiwan , , HP, , -! UNIX_SV.200+.setlocale.>.ja_JP.HP-SJIS: ! Japanese, Japan aka japanese 15 , , HP, -! UNIX_SV.200+.setlocale.>.ja_JP.HP-KANA8: ! Japanese, Japan , , HP, , - -! Thai -! UNIX_SV.200+.setlocale.>.th_TH.TIS-620: ! Thai, Thailand ,IBM, HP - -! codesets supported for iconv(1); iconv(3) & nl_langinfo not supported -UNIX_SV.200+.iconv1,iconv3.=.?.ISO-8859-1: ISO-8859-1 -! UNIX_SV.200+.iconv1,iconv3.=.?.ISO-8859-2: ISO8859-2 -! UNIX_SV.200+.iconv1,iconv3.=.?.ISO-8859-5: ISO8859-5 -! UNIX_SV.200+.iconv1,iconv3.=.?.ISO-8859-6: ISO8859-6 -! UNIX_SV.200+.iconv1,iconv3.=.?.ISO-8859-7: ISO8859-7 -! UNIX_SV.200+.iconv1,iconv3.=.?.ISO-8859-8: ISO8859-8 -! UNIX_SV.200+.iconv1,iconv3.=.?.ISO-8859-9: ISO8859-9 -! UNIX_SV.200+.iconv1,iconv3.=.?.EUC-KR: IBM-eucKR -UNIX_SV.200+.iconv1,iconv3.=.?.EUC-JP: eucJP -UNIX_SV.200+.iconv1,iconv3.~.ja_JP.SJIS: SJIS -! UNIX_SV.200+.iconv1,iconv3.=.?.EUC-TW: IBM-eucTW -! UNIX_SV.200+.iconv1,iconv3.=.?.EUC-CN: IBM-eucCN -! UNIX_SV.200+.iconv1,iconv3.>.?.HP-15CN: IBM-eucCN -! UNIX_SV.200+.iconv1,iconv3.=.?.IBM-437: IBM-437 -! UNIX_SV.200+.iconv1,iconv3.=.?.IBM-850: IBM-850 -! UNIX_SV.200+.iconv1,iconv3.=.?.IBM-856: IBM-856 -! UNIX_SV.200+.iconv1,iconv3.=.?.IBM-932: IBM-932 -! UNIX_SV.200+.iconv1,iconv3.>.?.HP-SJIS: IBM-932 -! UNIX_SV.200+.iconv1,iconv3.=.?.IBM-1046: IBM-1046 -! UNIX_SV.200+.iconv1,iconv3.=.?.UTF-8: UTF-8 -UNIX_SV.200+.iconv1,iconv3.>.?.ISO-2022-JP: ISO-2022-JP -! UNIX_SV.200+.iconv1,iconv3.>.?.ISO-2022-KR: fold7 -! UNIX_SV.200+.iconv1,iconv3.>.?.ISO-2022-TW: fold7 -! UNIX_SV.200+.iconv1,iconv3.>.?.ISO-2022-CN: fold7 -! UNIX_SV.200+.iconv1,iconv3.>.?.HP-BIG5: big5 -! UNIX_SV.200+.iconv1,iconv3.>.?.TIS-620: TIS-620 - -! codesets not supported by UNIX_SV iconv(1) -! UNIX_SV.?.iconv1,iconv3.~.?.ISO-8859-2: -! UNIX_SV.?.iconv1,iconv3.~.?.ISO-8859-5: -! UNIX_SV.?.iconv1,iconv3.~.?.ISO-8859-6: -! UNIX_SV.?.iconv1,iconv3.~.?.ISO-8859-7: -! UNIX_SV.?.iconv1,iconv3.~.?.ISO-8859-8: -! UNIX_SV.?.iconv1,iconv3.~.?.ISO-8859-9: -! UNIX_SV.?.iconv1,iconv3.~.?.IBM-437: -! UNIX_SV.?.iconv1,iconv3.~.?.IBM-850: -! UNIX_SV.?.iconv1,iconv3.~.?.IBM-856: -! UNIX_SV.?.iconv1,iconv3.~.?.IBM-1046: -! UNIX_SV.?.iconv1,iconv3.~.?.HP-ARABIC8: -! UNIX_SV.?.iconv1,iconv3.~.?.HP-GREEK8: -! UNIX_SV.?.iconv1,iconv3.~.?.HP-HEBREW8 -! UNIX_SV.?.iconv1,iconv3.~.?.HP-ROMAN8: -! UNIX_SV.?.iconv1,iconv3.~.?.HP-TURKISH8: -! UNIX_SV.?.iconv1,iconv3.~.?.TIS-620: -! UNIX_SV.?.iconv1,iconv3.~.?.HP-KANA8: -! UNIX_SV.?.iconv1,iconv3.~.?.HP-CCDC: -! UNIX_SV.?.iconv1,iconv3.~.?.UCS-2: - -! multibyte codesets -! This translation provides an alternative to a call to -! using setlocale() and MB_CUR_MAX to determine this. -! UNIX_SV.200+.multibyte.=.?.EUC-KR: 2 -UNIX_SV.200+.multibyte.=.?.EUC-JP: 2 -UNIX_SV.200+.multibyte.=.?.SJIS: 2 -! UNIX_SV.200+.multibyte.=.?.EUC-TW: 4 -! UNIX_SV.200+.multibyte.=.?.EUC-CN: 2 -! UNIX_SV.?.multibyte.~.?.HP-SJIS: 2 -! UNIX_SV.?.multibyte.~.?.IBM-932: 2 -! UNIX_SV.?.multibyte.~.?.HP-CCDC: 2 -! UNIX_SV.?.multibyte.~.?.HP-BIG5: 2 -! UNIX_SV.?.multibyte.~.?.TIS-620: 2 -! UNIX_SV.?.multibyte.~.?.HP-15CN: 2 - - -! Translations from predefined CCDF-locales to CDE Standard Locales -! UNIX_SV.?.ccdf.=.?.HP-ROMAN8: hp-roman8 -! UNIX_SV.?.ccdf.=.?.ISO-8859-1: iso8859-1 -! UNIX_SV.?.ccdf.=.ko_KR.EUC-KR: hp-korean15 -! UNIX_SV.?.ccdf.=.ja_JP.HP-SJIS: hp-japanese15 -! UNIX_SV.?.ccdf.=.?.DT-SYMBOL-1: symbol !!! standard Dt symbol font - -! These CDE standard locales may have CCDF-locales, but they are defined by localizers -! UNIX_SV.?.ccdf.=.ar_SA.HP-ARABIC8: arabic8 -! UNIX_SV.?.ccdf.=.el_GR.HP-GREEK8: greek8 -! UNIX_SV.?.ccdf.=.iw_IL.HP-HEBREW8: hebrew8 -! UNIX_SV.?.ccdf.=.tr_TR.HP-TURKISH8: turkish8 -! UNIX_SV.?.ccdf.<.ja_JP.HP-SJIS: sjis -! UNIX_SV.?.ccdf.=.ja_JP.HP-KANA8: kana8 -! UNIX_SV.?.ccdf.<.ja_JP.EUC-JP: ujis -! UNIX_SV.?.ccdf.=.zh_CN.HP-CCDC: roc15 - - -! Codesets that require multibyte parsing to avoid confusion with shell special chars -! Sun doesn't have these codesets -! UNIX_SV.?.dtkshSpecialParse.=.ja_JP.HP-SJIS: True -! UNIX_SV.?.dtkshSpecialParse.=.ja_JP.IBM-932: True -! UNIX_SV.?.dtkshSpecialParse.=.zh_TW.HP-BIG5: True -! UNIX_SV.?.dtkshSpecialParse.=.zh_TW.HP-CCDC: True -! UNIX_SV.?.dtkshSpecialParse.=.zh_TW.EUC-TW: 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 ISO-2022-JP -!! before it is sent. -UNIX_SV.200+.interchangeCodeset.~.?.ISO-8859-1: ISO-8859-1 ! ISO Latin 1 -! UNIX_SV.?.interchangeCodeset.>.?.HP-ROMAN8: ISO-8859-1 ! HP Roman8 -! UNIX_SV.?.interchangeCodeset.>.?.IBM-437: ISO-8859-1 ! PC (US) -! UNIX_SV.?.interchangeCodeset.>.?.IBM-850: ISO-8859-1 ! PC (Multi-lingual) -! UNIX_SV.?.interchangeCodeset.~.?.ISO-8859-2: ISO-8859-2 ! ISO Latin 2 -! UNIX_SV.?.interchangeCodeset.~.?.ISO-8859-5: ISO-8859-5 ! ISO Latin/Cyrillic -! UNIX_SV.?.interchangeCodeset.~.?.ISO-8859-6: ISO-8859-6 ! ISO Latin/Arabic -! UNIX_SV.?.interchangeCodeset.>.?.HP-ARABIC8: ISO-8859-6 ! HP Arabic8 -! UNIX_SV.?.interchangeCodeset.>.?.IBM-1046: ISO-8859-6 ! PC Arabic Code Set -! UNIX_SV.?.interchangeCodeset.~.?.ISO-8859-8: ISO-8859-8 ! ISO Latin/Hebrew -! UNIX_SV.?.interchangeCodeset.>.?.HP-HEBREW8: ISO-8859-8 ! HP Hebrew8 -! UNIX_SV.?.interchangeCodeset.>.?.IBM-856: ISO-8859-7 ! PC Hebrew -! UNIX_SV.?.interchangeCodeset.~.?.ISO-8859-7: ISO-8859-7 ! ISO Latin/Greek -! UNIX_SV.?.interchangeCodeset.>.?.HP-GREEK8: ISO-8859-7 ! HP Greek8 -! UNIX_SV.?.interchangeCodeset.~.?.ISO-8859-9: ISO-8859-9 ! ISO Latin 5 -! UNIX_SV.?.interchangeCodeset.>.?.HP-TURKISH8: ISO-8859-9 ! HP Turkish8 -UNIX_SV.200+.interchangeCodeset.~.?.EUC-JP: ISO-2022-JP ! Japanese EUC -! Add the following line -- hack to see if "japanese" works -UNIX_SV.200+.interchangeCodeset.=.?.EUC-JP: ISO-2022-JP ! Japanese EUC -UNIX_SV.200+.interchangeCodeset.~.?.ja_JP.SJIS: ja_JP.SJIS ! Japanese EUC -UNIX_SV.200+.interchangeCodeset.~.?.ISO-2022-JP: ISO-2022-JP ! Japanese EUC -! UNIX_SV.?.interchangeCodeset.>.?.HP-SJIS: ISO-2022-JP ! HP Japanese Shift JIS -! UNIX_SV.?.interchangeCodeset.>.?.IBM-932: ISO-2022-JP ! PC Japanese Shift JIS -! UNIX_SV.?.interchangeCodeset.>.?.HP-KANA8: ISO-2022-JP ! HP Japanese Katakana8 -! UNIX_SV.?.interchangeCodeset.~.?.EUC-KR: ISO-2022-KR ! Korean EUC -! UNIX_SV.?.interchangeCodeset.~.?.EUC-CN: ISO-2022-CN ! China Chinese EUC -! UNIX_SV.?.interchangeCodeset.~.?.EUC-TW: ISO-2022-TW ! Taiwan Chinese EUC -! UNIX_SV.?.interchangeCodeset.>.?.HP-BIG5: ISO-2022-TW ! HP Big5 Chinese -! UNIX_SV.?.interchangeCodeset.>.?.HP-CCDC: ISO-2022-TW ! HP CCDC Chinese -! UNIX_SV.?.interchangeCodeset.>.?.HP-15CN: ISO-2022-CN ! HP Chinese EUC -! UNIX_SV.?.interchangeCodeset.~.?.TIS-620: TIS-620 ! Thai -! UNIX_SV.?.interchangeCodeset.>.?.UCS-2: UTF-8 ! Unicode -! UNIX_SV.?.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). -UNIX_SV.?.mime.~.?.ISO-8859-1: ISO-8859-1 ! ISO Latin 1 -UNIX_SV.?.mime.~.?.HP-ROMAN8: X-HP-ROMAN8 ! HP Roman8 -UNIX_SV.?.mime.~.?.IBM-437: X-IBM-437 ! PC (US) -UNIX_SV.?.mime.~.?.IBM-850: X-IBM-850 ! PC (Multi-lingual) -UNIX_SV.?.mime.~.?.ISO-8859-2: ISO-8859-2 ! ISO Latin 2 -UNIX_SV.?.mime.~.?.ISO-8859-5: ISO-8859-5 ! ISO Latin/Cyrillic -UNIX_SV.?.mime.~.?.ISO-8859-6: ISO-8859-6 ! ISO Latin/Arabic -UNIX_SV.?.mime.~.?.HP-ARABIC8: X-HP-ARABIC8 ! HP Arabic8 -UNIX_SV.?.mime.~.?.IBM-1046: X-IBM-1046 ! PC Arabic Code Set -UNIX_SV.?.mime.~.?.ISO-8859-8: ISO-8859-8 ! ISO Latin/Hebrew -UNIX_SV.?.mime.~.?.HP-HEBREW8: X-HP-HEBREW8 ! HP Hebrew8 -UNIX_SV.?.mime.~.?.IBM-856: X-IBM-856 ! PC Hebrew -UNIX_SV.?.mime.~.?.ISO-8859-7: ISO-8859-7 ! ISO Latin/Greek -UNIX_SV.?.mime.~.?.HP-GREEK8: X-HP-GREEK8 ! HP Greek8 -UNIX_SV.?.mime.~.?.ISO-8859-9: ISO-8859-9 ! ISO Latin 5 -UNIX_SV.?.mime.~.?.HP-TURKISH8: X-HP-TURKISH8 ! HP Turkish8 -UNIX_SV.?.mime.~.?.EUC-JP: X-EUC-JP ! Japanese EUC -UNIX_SV.?.mime.~.?.ISO-2022-JP: ISO-2022-JP ! Japanese JIS with 7-bit encoding per ISO-2022-JP -UNIX_SV.?.mime.~.?.HP-SJIS: X-HP-SJIS ! HP Japanese Shift JIS -UNIX_SV.?.mime.~.?.IBM-932: X-IBM-932 ! PC Japanese Shift JIS -UNIX_SV.?.mime.~.?.HP-KANA8: X-HP-KANA8 ! HP Japanese Katakana8 -UNIX_SV.?.mime.~.?.EUC-KR: X-EUC-KR ! Korean EUC -UNIX_SV.?.mime.~.?.ISO-2022-KR: ISO-2022-KR ! Korean with 7-bit encoding per ISO-2022-KR -UNIX_SV.?.mime.~.?.EUC-CN: X-EUC-CN ! China Chinese EUC -UNIX_SV.?.mime.~.?.ISO-2022-CN: ISO-2022-CN ! China Chinese with 7-bit encoding per ISO-2022-CN -UNIX_SV.?.mime.~.?.HP-15CN: X-HP-15CN ! HP China Chinese EUC -UNIX_SV.?.mime.~.?.EUC-TW: X-EUC-TW ! Taiwan Chinese EUC -UNIX_SV.?.mime.~.?.ISO-2022-TW: ISO-2022-TW ! Taiwan Chinese with 7-bit encoding per ISO-2022-TW -UNIX_SV.?.mime.~.?.HP-BIG5: X-HP-BIG5 ! HP Big5 Taiwan Chinese -UNIX_SV.?.mime.~.?.HP-CCDC: X-HP-CCDC ! HP CCDC Taiwan Chinese -UNIX_SV.?.mime.~.?.TIS-620: X-TIS-620 ! Thai -UNIX_SV.?.mime.~.?.UCS-2: X-UCS-2 ! Unicode; group 0, plane 0 of ISO-10646 -UNIX_SV.?.mime.~.?.UCS-4: X-UCS-4 ! ISO-10646 -UNIX_SV.?.mime.~.?.UTF-7: X-UTF-7 ! multibyte encoding of Unicode -UNIX_SV.?.mime.~.?.UTF-8: X-UTF-8 ! multibyte encoding of Unicode -UNIX_SV.?.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 .lcx file in the /etc/dt/config/svc -!! or $HOME/.dt/config/svc directories. Such translations should read: -!! .100+.mime.<.?.: -!! -!! ***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. -UNIX_SV.?.mime.<.?.ISO-8859-1: us-ascii ! ISO Latin 1 -UNIX_SV.?.mime.<.?.ISO-8859-1: US-ASCII ! ISO Latin 1 - diff --git a/cde/lib/DtHelp/il/Imakefile b/cde/lib/DtHelp/il/Imakefile index b6219131..52684e54 100644 --- a/cde/lib/DtHelp/il/Imakefile +++ b/cde/lib/DtHelp/il/Imakefile @@ -25,11 +25,6 @@ DEFINES = -DDTLIB $(LOCAL_DEFINES) \ -DOSMINORVERSION=OSMinorVersion \ $(ICONV_INBUF_DEFINE) $(BIT_ORDER_DEFINES) -#ifdef SCOArchitecture -/* ilscalesample.o breaks the MS loader. Remove it for now */ -all:: ilscalesample.o libXvh.a -#endif - SRCS = ilX.c ilbigray.c ilcodec.c \ ilcontext.c ilconvert.c ilcrop.c \ ildata.c ildecompg3.c ildecompg4.c \ @@ -64,9 +59,4 @@ OBJS = ilX.o ilbigray.o ilcodec.o \ SubdirLibraryRule($(OBJS)) -/* MS Compiler bug, remove when we go to USL compiler */ -#ifdef SCOArchitecture -SpecialFlagsObjectRule(iltiff,-Oi -DUSE_INLINE_CODE) -#endif - DependTarget() diff --git a/cde/lib/DtSearch/Imakefile b/cde/lib/DtSearch/Imakefile index 248fd0cf..4e4bf580 100644 --- a/cde/lib/DtSearch/Imakefile +++ b/cde/lib/DtSearch/Imakefile @@ -9,10 +9,6 @@ EXTRALIBRARYDEPS = raima/DONE EXTRA_DEFINES = -DBYTE_SWAP -D_OSF_SOURCE #endif -#ifdef USLArchitecture -EXTRA_DEFINES = -DBYTE_SWAP -#endif - #if defined(LinuxArchitecture) || defined(BSDArchitecture) EXTRA_DEFINES = -DBYTE_SWAP #endif diff --git a/cde/lib/DtSearch/raima/Imakefile b/cde/lib/DtSearch/raima/Imakefile index 83cab841..f4ccc4c7 100644 --- a/cde/lib/DtSearch/raima/Imakefile +++ b/cde/lib/DtSearch/raima/Imakefile @@ -15,10 +15,6 @@ REQUIREDLIBS = -lc -lm EXTRA_DEFINES = -DBYTE_SWAP -D_OSF_SOURCE -D_XOPEN_SOURCE #endif -#ifdef USLArchitecture -EXTRA_DEFINES = -DBYTE_SWAP -D_XOPEN_SOURCE -#endif - #if defined(LinuxArchitecture) || defined(BSDArchitecture) EXTRA_DEFINES = -DBYTE_SWAP -D_XOPEN_SOURCE=700 #endif diff --git a/cde/lib/DtSvc/DtEncap/pty.c b/cde/lib/DtSvc/DtEncap/pty.c index fedee259..5bc0a6e1 100644 --- a/cde/lib/DtSvc/DtEncap/pty.c +++ b/cde/lib/DtSvc/DtEncap/pty.c @@ -1068,13 +1068,11 @@ int SPC_Setpgrp(int read_current_termio) return(SPC_ERROR); } -#if !defined(USL) if(tcsetattr(setpgrp_wire->fd[SLAVE_SIDE], TCSANOW, XeTermioStruct)==ERROR) { SPC_Error(SPC_Bad_tc_Call,(XeString)"tcsetattr"); _DtSvcProcessUnlock(); return(SPC_ERROR); } -#endif _DtSvcProcessUnlock(); return(TRUE); diff --git a/cde/lib/DtSvc/DtEncap/spc-net.c b/cde/lib/DtSvc/DtEncap/spc-net.c index 38f7cf23..fafff20b 100644 --- a/cde/lib/DtSvc/DtEncap/spc-net.c +++ b/cde/lib/DtSvc/DtEncap/spc-net.c @@ -388,12 +388,7 @@ SPC_Connection_Ptr SPC_Init_Child(SPC_Connection_Ptr conn, SPC_Connection_Ptr SPC_Standalone_Daemon(SPC_Connection_Ptr conn) { struct sockaddr_in saddr, client_saddr; -#ifdef USL - /* Only UnixWare 2.02 uses the Spec1170 parameter profile for accept(). */ - size_t len=sizeof(client_saddr); -#else int len=sizeof(client_saddr); -#endif int server_bind_attempts = MAX_SERVER_BIND_ATTEMPTS; int server_bind_pause = SERVER_PAUSE_INTERVAL; int pid, from; diff --git a/cde/lib/DtSvc/DtUtil1/CmdMain.c b/cde/lib/DtSvc/DtUtil1/CmdMain.c index cc15e2b6..2774f983 100644 --- a/cde/lib/DtSvc/DtUtil1/CmdMain.c +++ b/cde/lib/DtSvc/DtUtil1/CmdMain.c @@ -1030,7 +1030,7 @@ _DtCmdCommandInvokerExecute ( #ifdef _SUN_OS open_max = NOFILE; #else -#if defined(USL) || defined(_AIX) +#if defined(_AIX) open_max = FOPEN_MAX; #else open_max = FD_SETSIZE; diff --git a/cde/lib/DtSvc/DtUtil1/CmdProcess.c b/cde/lib/DtSvc/DtUtil1/CmdProcess.c index d1d02bd1..ba60e592 100644 --- a/cde/lib/DtSvc/DtUtil1/CmdProcess.c +++ b/cde/lib/DtSvc/DtUtil1/CmdProcess.c @@ -41,7 +41,7 @@ #include
#include "myassertP.h" -#if defined(sun) || defined(USL) +#if defined(sun) #include #endif diff --git a/cde/lib/DtSvc/DtUtil1/DbLoad.c b/cde/lib/DtSvc/DtUtil1/DbLoad.c index 24b8dbf6..6f8ce813 100644 --- a/cde/lib/DtSvc/DtUtil1/DbLoad.c +++ b/cde/lib/DtSvc/DtUtil1/DbLoad.c @@ -53,11 +53,11 @@ #include #else -#if defined(sun) || defined(USL) || defined(sco) +#if defined(sun) #include #else #include -#endif /* sun || USL */ +#endif /* sun */ #endif /* __hpux */ diff --git a/cde/lib/DtSvc/DtUtil1/DtsInit.c b/cde/lib/DtSvc/DtUtil1/DtsInit.c index b4295d19..68b1d2c5 100644 --- a/cde/lib/DtSvc/DtUtil1/DtsInit.c +++ b/cde/lib/DtSvc/DtUtil1/DtsInit.c @@ -51,11 +51,11 @@ #include #else -#if defined(sun) || defined(USL) || defined(sco) +#if defined(sun) #include #else #include -#endif /* sun || USL */ +#endif /* sun */ #endif /* __hpux */ diff --git a/cde/lib/DtSvc/DtUtil1/DtsMM.c b/cde/lib/DtSvc/DtUtil1/DtsMM.c index 8769f9cb..b06244ff 100644 --- a/cde/lib/DtSvc/DtUtil1/DtsMM.c +++ b/cde/lib/DtSvc/DtUtil1/DtsMM.c @@ -601,7 +601,7 @@ _DtDtsMMapDB(const char *CacheFile) mmaped_db = (char *)mmap(NULL, buf.st_size, PROT_READ, -#if defined(sun) || defined(USL) +#if defined(sun) /* MAP_NORESERVE is only supported on sun and novell platforms */ MAP_SHARED|MAP_NORESERVE, diff --git a/cde/lib/DtSvc/DtUtil2/FileUtil.c b/cde/lib/DtSvc/DtUtil2/FileUtil.c index 040cc84c..da24652d 100644 --- a/cde/lib/DtSvc/DtUtil2/FileUtil.c +++ b/cde/lib/DtSvc/DtUtil2/FileUtil.c @@ -40,11 +40,11 @@ #ifdef __hpux #include /* opendir(), directory(3C) */ #else -#if defined(sun) || defined(USL) || defined(sco) +#if defined(sun) #include /* opendir(), directory(3C) */ #else #include -#endif /* sun || USL */ +#endif /* sun */ #endif /* __hpux */ #include diff --git a/cde/lib/DtSvc/DtUtil2/Setlocale.h b/cde/lib/DtSvc/DtUtil2/Setlocale.h index abae3e71..fd935888 100644 --- a/cde/lib/DtSvc/DtUtil2/Setlocale.h +++ b/cde/lib/DtSvc/DtUtil2/Setlocale.h @@ -45,11 +45,6 @@ #include #include
-#ifdef sco /* XPG4isms coming soon */ -#ifndef _NL_DIRECT -#define _NL_DIRECT -typedef int nl_direct; -#endif #ifndef _NL_ORDER #define _NL_ORDER typedef int nl_order; diff --git a/cde/lib/DtSvc/DtUtil2/Utility.c b/cde/lib/DtSvc/DtUtil2/Utility.c index b2cb98cf..301e8fe3 100644 --- a/cde/lib/DtSvc/DtUtil2/Utility.c +++ b/cde/lib/DtSvc/DtUtil2/Utility.c @@ -38,7 +38,7 @@ #ifdef __hpux #include #else -#if defined(sun) || defined(USL) || defined(sco) +#if defined(sun) #include #else #include diff --git a/cde/lib/DtSvc/DtUtil2/XlationSvc.c b/cde/lib/DtSvc/DtUtil2/XlationSvc.c index 3a9b2b1f..23ab7f10 100644 --- a/cde/lib/DtSvc/DtUtil2/XlationSvc.c +++ b/cde/lib/DtSvc/DtUtil2/XlationSvc.c @@ -54,7 +54,7 @@ $END$ #endif #include -#if defined(sun) || defined(USL) +#if defined(sun) #include /* for compile,advance */ #else #include /* for regcomp,regexec */ @@ -125,7 +125,7 @@ typedef enum { __DtXLATE_TYPE_CONTAINS = 4 } __DtXlateType; -#if defined(sun) || defined(USL) +#if defined(sun) /* Sun doesn't support regcomp() and regexec() yet, so define this here and fill it will the results of advance() */ typedef struct regmatch_t { @@ -1127,7 +1127,7 @@ Boolean CheckSearchOpValueMatchesSpec( value or do a pure match */ if (srchData->curTransType == __DtXLATE_TYPE_REGEX) { -#if defined(sun) || defined(USL) +#if defined(sun) char * ex = NULL; /* True: leave escape char in place */ @@ -2199,7 +2199,7 @@ int _DtXlateGetXlateEnv( /* then look up version number of execution host */ if (ret_AppExecEnvVersion) { -#if defined(sun) || defined(_AIX) || defined(USL) || defined(__osf__) || defined(linux) || defined(CSRG_BASED) +#if defined(sun) || defined(_AIX) || defined(__osf__) || defined(linux) || defined(CSRG_BASED) char version[SYS_NMLN+SYS_NMLN+2]; #else char version[UTSLEN+UTSLEN+2]; diff --git a/cde/lib/DtSvc/DtUtil2/XlationSvc.h b/cde/lib/DtSvc/DtUtil2/XlationSvc.h index 2ccb22ec..ab2763e5 100644 --- a/cde/lib/DtSvc/DtUtil2/XlationSvc.h +++ b/cde/lib/DtSvc/DtUtil2/XlationSvc.h @@ -126,8 +126,6 @@ platforms as part of a translation. #define _DtPLATFORM_AIX "AIX" #define _DtPLATFORM_SUNOS "SunOS" #define _DtPLATFORM_SOLARIS "Solaris" /* verify */ -#define _DtPLATFORM_USL "USL" /* verify */ -#define _DtPLATFORM_SCO "SCO" /* verify */ #define _DtPLATFORM_XENIX "Xenix" /* verify */ /*$END$*/ diff --git a/cde/lib/DtSvc/include/bms/sbport.h b/cde/lib/DtSvc/include/bms/sbport.h index 12be77f6..05d9a732 100644 --- a/cde/lib/DtSvc/include/bms/sbport.h +++ b/cde/lib/DtSvc/include/bms/sbport.h @@ -230,9 +230,6 @@ # ifdef __sun # include # endif -#if defined(USL) -# include -# endif # ifdef __apollo # include # endif @@ -254,11 +251,6 @@ # ifdef _AIX # include # endif -/* -# if defined(USL) -# include -# endif -*/ #endif /* __need_fd_st */ @@ -293,7 +285,7 @@ /* about above. So, declare them only if we don't already have them */ /* ----------------------------------------------------------------- */ -#if defined(_HPUX_SOURCE) || defined(__sun) || defined(USL) || defined(_INCLUDE_BSD_SOURCE) || defined(_OSF_SOURCE) || defined(__aix) || defined(__osf__) || defined(linux) +#if defined(_HPUX_SOURCE) || defined(__sun) || defined(_INCLUDE_BSD_SOURCE) || defined(_OSF_SOURCE) || defined(__aix) || defined(__osf__) || defined(linux) /* the "u_types" are defined in standard files */ # undef _INCLUDE_BSD_SOURCE #else diff --git a/cde/lib/DtSvc/include/codelibs/dynarray.h b/cde/lib/DtSvc/include/codelibs/dynarray.h index eb627a8f..30a0cc83 100644 --- a/cde/lib/DtSvc/include/codelibs/dynarray.h +++ b/cde/lib/DtSvc/include/codelibs/dynarray.h @@ -39,7 +39,7 @@ #if !defined(linux) && !defined(CSRG_BASED) && !defined(sun) #include #endif -#if defined(USL) || defined(__osf__) || defined(sun) || defined(linux) || defined(CSRG_BASED) +#if defined(__osf__) || defined(sun) || defined(linux) || defined(CSRG_BASED) #define _DELETE_ARRAY(sz) delete[] #else #define _DELETE_ARRAY(sz) delete[(sz)] diff --git a/cde/lib/DtSvc/include/codelibs/mbstring.h b/cde/lib/DtSvc/include/codelibs/mbstring.h index ecaae3b3..3c685953 100644 --- a/cde/lib/DtSvc/include/codelibs/mbstring.h +++ b/cde/lib/DtSvc/include/codelibs/mbstring.h @@ -32,10 +32,6 @@ #ifndef __MBSTRING_H_ #define __MBSTRING_H_ -#if defined(USL) -#include -#endif - #include #ifdef apollo diff --git a/cde/lib/DtSvc/include/codelibs/stringx.h b/cde/lib/DtSvc/include/codelibs/stringx.h index 3da5f4b0..477bd1f6 100644 --- a/cde/lib/DtSvc/include/codelibs/stringx.h +++ b/cde/lib/DtSvc/include/codelibs/stringx.h @@ -125,14 +125,14 @@ extern size_t nl_strlen(); /* __OBSOLETE */ #if defined(__cplusplus) } -#if defined(apollo) || defined(__aix) || defined(USL) || defined(__osf__) || defined(linux) || defined(CSRG_BASED) +#if defined(apollo) || defined(__aix) || defined(__osf__) || defined(linux) || defined(CSRG_BASED) #include #else #include #endif /* apollo */ inline char *strnew(size_t len) { return (char*)malloc(len + 1); } -#if defined(sun) || defined(__sun) || defined(USL) +#if defined(sun) || defined(__sun) inline void strfree(const char *s) { if (s != NULL) free((char *)s); } #else diff --git a/cde/lib/DtSvc/libDtSvc.elist b/cde/lib/DtSvc/libDtSvc.elist index 080986df..e09c2949 100644 --- a/cde/lib/DtSvc/libDtSvc.elist +++ b/cde/lib/DtSvc/libDtSvc.elist @@ -14,9 +14,7 @@ * **************************************************************************/ -#ifdef USL -/* define boolean boolean */ -#elif defined(SVR4) +#if defined(SVR4) # define boolean boolean_t #else # define boolean int @@ -1121,8 +1119,6 @@ internal __link__std__shellscan_C_000046c7_parsemeta_ internalC++ shellscan_C:__std #elif defined(_AIX) internalC++ __sterm80000000_x_2fproj_2fcde_2flib_2fDtSvc_2fDtCodelibs_2fshellscan_2eC() -#elif defined(USL) -internalC++ shellscan:__std #endif */ diff --git a/cde/lib/DtTerm/Term/TermParse.c b/cde/lib/DtTerm/Term/TermParse.c index d498877f..594b3c62 100644 --- a/cde/lib/DtTerm/Term/TermParse.c +++ b/cde/lib/DtTerm/Term/TermParse.c @@ -67,11 +67,6 @@ static char rcs_id[] = "$TOG: TermParse.c /main/3 1999/10/15 12:25:13 mgreess $" #include #endif -#if defined(USL) -#include -#include -#endif - /*****************************************************************************/ #define NPARAM 16 diff --git a/cde/lib/DtTerm/TermPrim/Imakefile b/cde/lib/DtTerm/TermPrim/Imakefile index 51e4c1bd..0f209613 100644 --- a/cde/lib/DtTerm/TermPrim/Imakefile +++ b/cde/lib/DtTerm/TermPrim/Imakefile @@ -102,10 +102,6 @@ LinkFile(TermPrimGetPty.c,TermPrimGetPty-svr4.c) LinkFile(TermPrimGetPty.c,TermPrimGetPty-svr4.c) #endif -#ifdef USLArchitecture -LinkFile(TermPrimGetPty.c,TermPrimGetPty-svr4.c) -#endif - #ifdef BSDArchitecture LinkFile(TermPrimGetPty.c,TermPrimGetPty-bsd.c) #endif diff --git a/cde/lib/DtTerm/TermPrim/TermHeader.h b/cde/lib/DtTerm/TermPrim/TermHeader.h index 11ba7ac1..2590b0cc 100644 --- a/cde/lib/DtTerm/TermPrim/TermHeader.h +++ b/cde/lib/DtTerm/TermPrim/TermHeader.h @@ -44,7 +44,7 @@ #include #include -#if defined(linux) || (defined(USL) && (OSMAJORVERSION > 1)) || defined(CSRG_BASED) +#if defined(linux) || defined(CSRG_BASED) #define _NFILE FOPEN_MAX #endif diff --git a/cde/lib/DtTerm/TermPrim/TermPrimBuffer.h b/cde/lib/DtTerm/TermPrim/TermPrimBuffer.h index 0fa76368..3c39c41d 100644 --- a/cde/lib/DtTerm/TermPrim/TermPrimBuffer.h +++ b/cde/lib/DtTerm/TermPrim/TermPrimBuffer.h @@ -201,17 +201,6 @@ sun_wcwidth ); #endif /* USE_SUN_WCWIDTH_PATCH */ -#ifdef USE_USL_WCWIDTH_PATCH -/* -** A small workaround for systems that don't have wcwidth... -*/ -int -usl_wcwidth -( - const wchar_t wc -); -#endif /* USE_USL_WCWIDTH_PATCH */ - /* ** Truncate the specified line to the desired width, return diff --git a/cde/lib/DtTerm/TermPrim/TermPrimBufferWc.c b/cde/lib/DtTerm/TermPrim/TermPrimBufferWc.c index bdd0b94e..b6a27e15 100644 --- a/cde/lib/DtTerm/TermPrim/TermPrimBufferWc.c +++ b/cde/lib/DtTerm/TermPrim/TermPrimBufferWc.c @@ -126,20 +126,6 @@ sun_wcwidth } #endif /* USE_SUN_WCWIDTH_PATCH */ -#ifdef USE_USL_WCWIDTH_PATCH -/* -** A small workaround for systems that don't have wcwidth... -*/ -int -usl_wcwidth -( - const wchar_t wc -) -{ - return(1); -} -#endif /* USE_USL_WCWIDTH_PATCH */ - short _DtTermPrimBufferGetTextWc ( diff --git a/cde/lib/DtTerm/TermPrim/TermPrimOSDepI.h b/cde/lib/DtTerm/TermPrim/TermPrimOSDepI.h index 262e6846..3f9da45f 100644 --- a/cde/lib/DtTerm/TermPrim/TermPrimOSDepI.h +++ b/cde/lib/DtTerm/TermPrim/TermPrimOSDepI.h @@ -125,12 +125,5 @@ # define USE_TCSENDBREAK /* use tiocbreak() */ #endif /* IBM_ARCHITECTURE */ -#ifdef USL_ARCHITECTURE -# define XOR_CAPS_LOCK /* xor caps lock and shift */ -# define USE_STREAMS /* use streams */ -# define USE_STREAMS_TTCOMPAT /* use ttcompat streams mod */ -# define USE_TCSENDBREAK /* use tiocbreak() */ -#endif /* USL_ARCHITECTURE */ - #endif /* _Dt_TermPrimOSDepI_h */ /* DON'T ADD ANYTHING AFTER THIS #endif... */ diff --git a/cde/lib/DtTerm/TermPrim/TermPrimSelect.c b/cde/lib/DtTerm/TermPrim/TermPrimSelect.c index 16f421f3..5f2c302a 100644 --- a/cde/lib/DtTerm/TermPrim/TermPrimSelect.c +++ b/cde/lib/DtTerm/TermPrim/TermPrimSelect.c @@ -53,7 +53,7 @@ static char rcs_id[] = "$TOG: TermPrimSelect.c /main/6 1999/10/14 16:22:53 mgree #include #include -#if defined(USL) || defined(OPENBSD_ARCHITECTURE) +#if defined(OPENBSD_ARCHITECTURE) #include #include #endif diff --git a/cde/lib/DtTerm/TermPrim/TermPrimSetUtmp.c b/cde/lib/DtTerm/TermPrim/TermPrimSetUtmp.c index 4bf8eb7f..a28ce8f4 100644 --- a/cde/lib/DtTerm/TermPrim/TermPrimSetUtmp.c +++ b/cde/lib/DtTerm/TermPrim/TermPrimSetUtmp.c @@ -390,14 +390,14 @@ UtmpEntryCreate(Widget w, pid_t pid, char *utmpLine) (void) strncpy(utPtr->ut_id, utmpLine, sizeof(utPtr->ut_id)); #else /* __AIX || __osf__ */ -#if defined(linux) || defined(sun) || defined(USL) +#if defined(linux) || defined(sun) if (c = strchr(utmpLine, '/')) { c++; } else { c = utmpLine; } (void) strncpy(utPtr->ut_id, c, sizeof(utPtr->ut_id)); -#else /* linux || sun || USL */ +#else /* linux || sun */ error out -- missing code for utPtr->ut_id #endif /* sun */ #endif /* __AIX || __osf__ */ diff --git a/cde/lib/DtWidget/Editor.c b/cde/lib/DtWidget/Editor.c index e60db511..c30d584c 100644 --- a/cde/lib/DtWidget/Editor.c +++ b/cde/lib/DtWidget/Editor.c @@ -53,7 +53,7 @@ #include #include -#if defined(__hpux) || defined(__osf__) || defined(USL) +#if defined(__hpux) || defined(__osf__) # include #elif defined(sun) # if (_XOPEN_VERSION==3) @@ -776,8 +776,6 @@ static XtActionsRec EditorActionTable[] = { /* digital compiler flagged warning */ /* IBM defines wctype to get_wctype above - don't use const. */ static char *blankString = "space"; -#elif defined(USL) -# define wctype_t int #else /* __osf__ || _AIX */ static const char *blankString = "space"; #endif /* __osf__ || _AIX */ @@ -1375,7 +1373,7 @@ WidgetClass dtEditorWidgetClass = (WidgetClass) &dtEditorClassRec; static void ClassInitialize(void) { -#if !(defined(sun) && (_XOPEN_VERSION==3)) && !defined(USL) +#if !(defined(sun) && (_XOPEN_VERSION==3)) _DtEditor_blankClass = wctype(blankString); /* @@ -5245,7 +5243,7 @@ lineBlank( byteNum += mblen(&pLine[byteNum], mbCurMax), charNum++) { (void) mbtowc(&wc, &pLine[byteNum], mbCurMax); -#if !(defined(sun) && (_XOPEN_VERSION==3)) && !defined(USL) +#if !(defined(sun) && (_XOPEN_VERSION==3)) if( !iswctype(wc, _DtEditor_blankClass) ) return False; #else @@ -5269,7 +5267,7 @@ findNonBlank( byteNum += mblen(&pLine[byteNum], mbCurMax), charNum++) { (void) mbtowc(&wc, &pLine[byteNum], mbCurMax); -#if !(defined(sun) && (_XOPEN_VERSION==3)) && !defined(USL) +#if !(defined(sun) && (_XOPEN_VERSION==3)) if( !iswctype(wc, _DtEditor_blankClass) ) return &pLine[byteNum]; #else @@ -5326,7 +5324,7 @@ countBlanks( count++; /* multibyte control chars??? */ continue; } -#if !(defined(sun) && (_XOPEN_VERSION==3)) && !defined(USL) +#if !(defined(sun) && (_XOPEN_VERSION==3)) if(!iswctype(wc, _DtEditor_blankClass)) return count; #else diff --git a/cde/lib/DtWidget/Imakefile b/cde/lib/DtWidget/Imakefile index 8cec7368..482fd30b 100644 --- a/cde/lib/DtWidget/Imakefile +++ b/cde/lib/DtWidget/Imakefile @@ -55,11 +55,6 @@ OBJS = \ #include -/* MS Compiler bug, remove when we go to USL compiler */ -#ifdef SCOArchitecture -SpecialFlagsObjectRule(Clock, -Olegtc) -#endif - DependTarget() LOCAL_CPP_DEFINES = -DCDE_INSTALLATION_TOP=$(CDE_INSTALLATION_TOP) diff --git a/cde/lib/DtWidget/SpinBox.c b/cde/lib/DtWidget/SpinBox.c index 358b5099..e3e5e3c2 100644 --- a/cde/lib/DtWidget/SpinBox.c +++ b/cde/lib/DtWidget/SpinBox.c @@ -88,6 +88,11 @@ express or implied warranty. * */ +/*Support for a legacy operating system has resulted in some leftover cruft + * code which wasn't ifdefed out, this needs to be cleaned, such code is + * marked Legacy: - 05/19/18 - C + */ + #include
#include #include @@ -263,12 +268,13 @@ static XmString InitLabel = NULL; #define SPIN_MARGIN_W(w) MarginWidth(w) #define SPIN_MARGIN_H(w) MarginHeight(w) #define MAXINT 2147483647 /* Taken from TextF.c */ -#define DEFAULT_COL 20 +#define DEFAULT_COL 20 -/* USL: Label get Focus */ +/* Legacy: Label get Focus */ static XtTranslations child_trans_label; -/* USL: Keyboard only for Text */ +/* Legacy: Keyboard only for Text */ static XtTranslations child_trans_text; + static XtTranslations child_trans_arrow; static XtTranslations child_trans; @@ -309,7 +315,7 @@ static char const SpinBoxLabelTranslationTable[] = "\ ~s ~m ~a space: SpinBoxGetFocus() \n\ "; -/* USL: Keyboard Only Traversing During Editable-Mode */ +/* Legacy: Keyboard Only Traversing During Editable-Mode */ static char const SpinBoxTextTranslationTable[] = "\ osfUp: SpinBoxUp(child) SpinBoxRight(child)\n\ osfDown: SpinBoxDown(child) SpinBoxLeft(child)\n\ @@ -617,9 +623,7 @@ Initialize( DtSpinBoxWidget request, text_activate_cb, (XtPointer)new); XtAddCallback(Text(new), XmNfocusCallback, text_focus_cb, (XtPointer)new); - /* USL */ - XtOverrideTranslations((Widget)Text(new), child_trans_text); - n = 0; + if (TextColumns(request) == DEFAULT_COL && Width(request)) { Dimension width; CalculateSizes(new, &width, NULL, NULL); @@ -649,9 +653,7 @@ Initialize( DtSpinBoxWidget request, } Label(new) = XtCreateManagedWidget(widget_name, xmLabelWidgetClass, (Widget)new, args, n); - /* USL */ - XtOverrideTranslations((Widget)Label(new), child_trans_label); - n = 0; + if (unit_type != XmPIXELS) { XtSetArg(args[n], XmNunitType, unit_type); n++; } @@ -1003,9 +1005,8 @@ _SpinBoxEndLine( DtSpinBoxWidget spin, Current(spin), FALSE); } } - /* - * USL: Get Focus for SpinBox when hit its label part + * Legacy: Get Focus for SpinBox when hit its label part */ static void _SpinBoxGetFocus( DtSpinBoxWidget spin, @@ -1018,7 +1019,7 @@ _SpinBoxGetFocus( DtSpinBoxWidget spin, } /* - * USL: Process Focus Traversal for SpinBox when cursor is in its arrow part + * Legacy: Process Focus Traversal for SpinBox when cursor is in its arrow part */ static void _SpinBoxPrevTabGroup(DtSpinBoxWidget spin, diff --git a/cde/lib/csa/agent.c b/cde/lib/csa/agent.c index a76ac6f9..7db5e50b 100644 --- a/cde/lib/csa/agent.c +++ b/cde/lib/csa/agent.c @@ -37,14 +37,14 @@ #if !defined(linux) && !defined(CSRG_BASED) # include #endif -#if defined(SunOS) || defined(USL) +#if defined(SunOS) #include #include #else #include #include #include -#endif /* SunOS || USL */ +#endif /* SunOS */ #include #include "agent.h" @@ -78,7 +78,7 @@ static int mapped = 0; /****************************************************************************** * forward declaration of static functions used within the file ******************************************************************************/ -#if defined(SunOS) || defined(USL) +#if defined(SunOS) static u_long gettransient (u_long version); #else static u_long gettransient (int proto, u_long vers, int *sockp); @@ -104,13 +104,13 @@ _DtCm_init_agent() { int s = RPC_ANYSOCK; -#if defined(SunOS) && SunOS < 55 || defined(USL) +#if defined(SunOS) && SunOS < 55 extern boolean_t rpc_reg(const u_long, const u_long, const u_long, const char *(*)(), const xdrproc_t, const xdrproc_t, const char *); #endif -#if defined(SunOS) || defined(USL) +#if defined(SunOS) extern void (*sigset(int, void (*)(int)))(int); #else extern void (*sigset())(); @@ -122,7 +122,7 @@ _DtCm_init_agent() DP(("libdtcm: _DtCm_init_agent\n")); -#if defined(SunOS) || defined(USL) +#if defined(SunOS) (void)rpcb_unset(_DtCm_transient, AGENTVERS, NULL); if ((_DtCm_transient = gettransient((u_long)1)) == 0) { _DtCm_print_errmsg("Cannot get transient program number\n"); @@ -168,7 +168,7 @@ _DtCm_init_agent() _DtCm_print_errmsg("Callback cannot be enabled.\n"); } -#endif /* SunOS || USL */ +#endif /* SunOS */ /* locking candidate for MT-safe purpose */ mapped = 1; @@ -185,13 +185,13 @@ _DtCm_destroy_agent() DP(("libdtcm: _DtCm_destroy_agent\n")); -#if defined(SunOS) || defined(USL) +#if defined(SunOS) (void) rpcb_unset(_DtCm_transient, AGENTVERS, NULL); (void) rpcb_unset(_DtCm_transient, AGENTVERS_2, NULL); #else (void) pmap_unset(_DtCm_transient, AGENTVERS); (void) pmap_unset(_DtCm_transient, AGENTVERS_2); -#endif /* SunOS || USL */ +#endif /* SunOS */ /* locking candidate for MT-safe purpose */ mapped = 0; @@ -362,7 +362,7 @@ cmcb_update_callback_2_svc(cmcb_update_callback_args *args, struct svc_req *d) /* * get transient program number for callbacks. */ -#if defined(SunOS) || defined(USL) +#if defined(SunOS) static u_long gettransient (u_long version) { @@ -406,7 +406,7 @@ gettransient (u_long version) return prognum; } -#else /* SunOS || USL */ +#else /* SunOS */ static u_long gettransient (int proto, u_long vers, int *sockp) @@ -457,7 +457,7 @@ gettransient (int proto, u_long vers, int *sockp) return (prognum-1); } -#endif /* not SunOS || USL */ +#endif /* not SunOS */ static void _DtCm_handle_callback() diff --git a/cde/lib/csa/connection.c b/cde/lib/csa/connection.c index 2cf114e1..d894a2d1 100644 --- a/cde/lib/csa/connection.c +++ b/cde/lib/csa/connection.c @@ -113,7 +113,7 @@ _DtCm_create_udp_client( return (CSA_SUCCESS); } -#if defined(SunOS) || defined(USL) +#if defined(SunOS) cl = clnt_create_vers(host, TABLEPROG, &vers_out, TABLEVERS_2, version, "udp"); if (cl==NULL) { @@ -208,7 +208,7 @@ _DtCm_create_tcp_client( return (CSA_SUCCESS); } else { /* create tcp connection */ -#if defined(SunOS) || defined(USL) +#if defined(SunOS) cl = clnt_create_vers(host, TABLEPROG, &vers_out, TABLEVERS_2, version, "tcp"); #else @@ -438,7 +438,7 @@ extern CSA_return_code _DtCm_clntstat_to_csastat(enum clnt_stat clntstat) { switch (clntstat) { -#if defined(SunOS) || defined(USL) +#if defined(SunOS) case RPC_N2AXLATEFAILURE: #endif case RPC_UNKNOWNHOST: @@ -461,7 +461,7 @@ create_auth(CLIENT *cl) { /* Always cache the Unix style credentials. */ if (unix_credential == NULL) -#if defined(SunOS) || defined(USL) +#if defined(SunOS) unix_credential = authsys_create_default (); #else unix_credential = authunix_create_default (); @@ -732,7 +732,7 @@ get_new_client_handle(_DtCm_Connection *conn) oldver = conn->ci->vers_out; /* always get a udp client handle first */ -#if defined(SunOS) || defined(USL) +#if defined(SunOS) cl = clnt_create_vers(conn->ci->host, TABLEPROG, &(conn->ci->vers_out), TABLEVERS_2, oldver, "udp"); if (cl == NULL) { @@ -788,7 +788,7 @@ get_new_client_handle(_DtCm_Connection *conn) /* get a tcp client handle */ oldver = conn->ci->vers_out; -#if defined(SunOS) || defined(USL) +#if defined(SunOS) cl = clnt_create_vers(conn->ci->host, TABLEPROG, &(conn->ci->vers_out), TABLEVERS_2, oldver, "tcp"); if (cl == NULL) diff --git a/cde/lib/csa/lutil.c b/cde/lib/csa/lutil.c index 670a80f9..e3750120 100644 --- a/cde/lib/csa/lutil.c +++ b/cde/lib/csa/lutil.c @@ -36,7 +36,7 @@ #include #include #include -#if defined(sun) || defined(USL) +#if defined(sun) #include #include #endif @@ -81,11 +81,11 @@ _DtCmGetLocalHost() if (host == NULL) { host = (char *)malloc(MAXHOSTNAMELEN+1); -#if defined(sun) || defined(USL) +#if defined(sun) (void)sysinfo(SI_HOSTNAME, host, MAXHOSTNAMELEN); #else (void)gethostname(host, MAXHOSTNAMELEN); -#endif /* sun || USL */ +#endif /* sun */ } return (host); @@ -100,11 +100,11 @@ _DtCmGetLocalDomain(char *hostname) if (domain == NULL) { domain = (char *)malloc(BUFSIZ); -#if defined(sun) || defined(USL) +#if defined(sun) sysinfo(SI_SRPC_DOMAIN, domain, BUFSIZ - 1); #else getdomainname(domain, BUFSIZ - 1); -#endif /* sun || USL */ +#endif /* sun */ /* check domain name */ /* this is a hack to find out the domain name that diff --git a/cde/lib/tt/bin/shell/mover.C b/cde/lib/tt/bin/shell/mover.C index 7c1d0bbb..5c1aee36 100644 --- a/cde/lib/tt/bin/shell/mover.C +++ b/cde/lib/tt/bin/shell/mover.C @@ -38,7 +38,7 @@ #if defined(__osf__) || defined(linux) || defined(CSRG_BASED) #include #else -#if !defined(USL) && !defined(sun) +#if !defined(sun) #include #endif #endif @@ -49,9 +49,6 @@ #define S_ISLNK(m) (((m)&IFMT) == IFLNK) #endif #include -#if defined(OPT_BUG_USL) -#define S_ISLNK(mode) (((mode) & S_IFMT) == S_IFLNK) -#endif #include #include "api/c/tt_c.h" #include "util/tt_gettext.h" diff --git a/cde/lib/tt/bin/shell/rcopier.C b/cde/lib/tt/bin/shell/rcopier.C index 4a09c01d..8837ab32 100644 --- a/cde/lib/tt/bin/shell/rcopier.C +++ b/cde/lib/tt/bin/shell/rcopier.C @@ -37,10 +37,8 @@ #ifdef __osf__ #include #else -#ifndef USL #include #endif -#endif #if defined(OPT_BUG_SUNOS_4) # include #endif diff --git a/cde/lib/tt/bin/shell/remover.C b/cde/lib/tt/bin/shell/remover.C index 0b22558d..7a64c300 100644 --- a/cde/lib/tt/bin/shell/remover.C +++ b/cde/lib/tt/bin/shell/remover.C @@ -38,7 +38,7 @@ #if defined(__osf__) || defined(linux) || defined(CSRG_BASED) #include #else -#if !defined(USL) && !defined(sun) +#if !defined(sun) #include #endif #endif @@ -49,9 +49,6 @@ #define S_ISLNK(m) (((m)&IFMT) == IFLNK) #endif #include -#if defined(OPT_BUG_USL) -#define S_ISLNK(mode) (((mode) & S_IFMT) == S_IFLNK) -#endif #include #include "api/c/tt_c.h" #include "util/tt_path.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..98f95bac 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 @@ -45,12 +45,6 @@ #if defined(sgi) || defined(CSRG_BASED) #include #endif -#if defined(USL) -#include "tt_options.h" -#if defined(OPT_BUG_USL) -extern "C" int getopt(int, char *const *, const char *); -#endif -#endif #include "mp/mp_global.h" #include "mp/mp_mp.h" #include "mp_otype.h" diff --git a/cde/lib/tt/bin/tt_type_comp/mp_types_table.C b/cde/lib/tt/bin/tt_type_comp/mp_types_table.C index 16817071..adc5bf06 100644 --- a/cde/lib/tt/bin/tt_type_comp/mp_types_table.C +++ b/cde/lib/tt/bin/tt_type_comp/mp_types_table.C @@ -50,15 +50,6 @@ #include #include -#if defined(OPT_BUG_UW_2) -extern "C" { -int putenv(char *); -FILE *popen(const char *, const char *); -FILE *fdopen(int, const char *); -int pclose(FILE *); -} -#endif - #define TT_TYPE_TABLE_BUCKETS 19 static int use_cpp; diff --git a/cde/lib/tt/bin/ttdbserverd/db_server_functions.C b/cde/lib/tt/bin/ttdbserverd/db_server_functions.C index 210cc33c..55a9f918 100644 --- a/cde/lib/tt/bin/ttdbserverd/db_server_functions.C +++ b/cde/lib/tt/bin/ttdbserverd/db_server_functions.C @@ -80,12 +80,7 @@ char **global_envp; // This is the PID or TID of the procedure that is // performing the garbage collection. // -#if defined(USL) -int _tt_garbage_id = 0; // TID or PID. -#else int _tt_garbage_id = -1; // TID or PID. -#endif - int _tt_run_garbage_collect(int in_parallel); static const char * sesProp = _TT_FILEJOIN_PROPNAME; @@ -2737,7 +2732,7 @@ _tt_run_garbage_collect(int in_parallel) // // FORK and EXEC ourself '-G'. // -#if defined(OPT_BUG_AIX) || defined(OPT_BUG_USL) +#if defined(OPT_BUG_AIX) #define vfork fork #endif switch (_tt_garbage_id = (int)vfork()) { diff --git a/cde/lib/tt/bin/tttar/tttar.C b/cde/lib/tt/bin/tttar/tttar.C index b7dab490..f4ca174a 100644 --- a/cde/lib/tt/bin/tttar/tttar.C +++ b/cde/lib/tt/bin/tttar/tttar.C @@ -40,7 +40,7 @@ #if defined(__osf__) || defined(linux) || defined(sun) || defined(CSRG_BASED) #include #else -#if !defined(USL) && !defined(sun) +#if !defined(sun) #include #endif #endif @@ -52,10 +52,6 @@ #include "tt_options.h" #include "archiver.h" -#if defined(OPT_BUG_USL) -#include -#endif - TT_INSERT_COPYRIGHT #ifdef OPT_PATCH diff --git a/cde/lib/tt/bin/tttar/tttar_api.C b/cde/lib/tt/bin/tttar/tttar_api.C index f2a95146..79a30827 100644 --- a/cde/lib/tt/bin/tttar/tttar_api.C +++ b/cde/lib/tt/bin/tttar/tttar_api.C @@ -36,10 +36,8 @@ #if defined(__osf__) || defined(linux) || defined(CSRG_BASED) || defined(sun) #include #else -#ifndef USL #include #endif -#endif #include #include "api/c/api_api.h" #include "api/c/tt_c.h" diff --git a/cde/lib/tt/bin/tttar/tttar_file_utils.C b/cde/lib/tt/bin/tttar/tttar_file_utils.C index fc50bb53..2184fefc 100644 --- a/cde/lib/tt/bin/tttar/tttar_file_utils.C +++ b/cde/lib/tt/bin/tttar/tttar_file_utils.C @@ -45,9 +45,6 @@ #include #include "tttar_utils.h" #include "tttar_file_utils.h" -#if defined(OPT_BUG_USL) -#define S_ISLNK(mode) (((mode) & S_IFMT) == S_IFLNK) -#endif extern char *_tt_get_realpath(char *, char *); diff --git a/cde/lib/tt/bin/tttar/tttar_spec.C b/cde/lib/tt/bin/tttar/tttar_spec.C index a93ecd7a..73052950 100644 --- a/cde/lib/tt/bin/tttar/tttar_spec.C +++ b/cde/lib/tt/bin/tttar/tttar_spec.C @@ -35,16 +35,7 @@ #if defined(__osf__) || defined(linux) || defined(CSRG_BASED) || defined(sun) #include #else -#if defined (USL) -#include "tt_options.h" -#if defined(OPT_BUG_USL) -#include -#else -#include -#endif /* if defined(OPT_BUG_USL) */ -#else #include -#endif #endif /* __osf__ */ #include "api/c/tt_c.h" #include "util/tt_iostream.h" diff --git a/cde/lib/tt/lib/libtt.elist b/cde/lib/tt/lib/libtt.elist index ce06b3ea..b01979ec 100644 --- a/cde/lib/tt/lib/libtt.elist +++ b/cde/lib/tt/lib/libtt.elist @@ -28,10 +28,6 @@ #endif #include "tt_options.h" -#ifdef USL -# define FILE _FILE_ -#endif - #ifdef _AIX # define size_t unsigned long # define pid_t int @@ -2555,10 +2551,6 @@ internalC++ _tt_ReadAuthFileEntry(FILE*) internalC++ _tt_UnlockAuthFile(char*) internalC++ _tt_WriteAuthFileEntry(FILE*,_tt_AuthFileEntry*) -#ifdef OPT_BUG_USL -internal _xti_strerror -#endif - #ifdef _AIX /* Including defines these symbols everywhere on AIX machines. */ internal __page_size diff --git a/cde/lib/tt/lib/mp/mp_c_session.C b/cde/lib/tt/lib/mp/mp_c_session.C index 57d9a07e..d9c81381 100644 --- a/cde/lib/tt/lib/mp/mp_c_session.C +++ b/cde/lib/tt/lib/mp/mp_c_session.C @@ -268,7 +268,7 @@ startup_ttsession(_Tt_string &start_ttcmd) #endif SIG_PF istat, qstat, cstat; -#if defined(_AIX) || defined(OPT_BUG_USL) +#if defined(_AIX) #define vfork fork #endif if((pid = vfork()) == 0) { diff --git a/cde/lib/tt/lib/mp/mp_rpc_client.C b/cde/lib/tt/lib/mp/mp_rpc_client.C index a5825337..76dbe48d 100644 --- a/cde/lib/tt/lib/mp/mp_rpc_client.C +++ b/cde/lib/tt/lib/mp/mp_rpc_client.C @@ -310,13 +310,6 @@ call(int procnum, xdrproc_t inproc, char *in, } } -#if defined(OPT_BUG_USL) - if (timeout <= 0) - { - outproc = (xdrproc_t) NULL; - } -#endif - // // tcp write errors (when the rpc_server on the other end dies) // cause a SIGPIPE. We need to make sure the SIGPIPE is caught, @@ -325,14 +318,10 @@ call(int procnum, xdrproc_t inproc, char *in, if (sigaction(SIGPIPE, 0, &curr_action) != 0) { _tt_syslog( 0, LOG_ERR, "sigaction(): %m" ); } -#if defined(OPT_BUG_SUNOS_5) || defined(OPT_BUG_UW_1) +#if defined(OPT_BUG_SUNOS_5) if ((SIG_TYP)curr_action.sa_handler == SIG_DFL) -#else -#if defined(OPT_BUG_UW_2) - if ((void(*)(int))curr_action.sa_handler == SIG_DFL) #else if (curr_action.sa_handler == SIG_DFL) -#endif #endif { need2reset_sigpipe = 1; @@ -357,16 +346,6 @@ call(int procnum, xdrproc_t inproc, char *in, outproc, out, total_timeout); } -#if defined(OPT_BUG_USL) - if (timeout <= 0) - { - total_timeout.tv_sec = 10; - total_timeout.tv_usec = 0; - clnt_control(_client, CLSET_TIMEOUT, (char *) &total_timeout); - clnt_call(_client, NULLPROC, (xdrproc_t) xdr_void, (char *)NULL, - (xdrproc_t) xdr_void, (char *) NULL, total_timeout); - } -#endif if (need2reset_sigpipe) { signal(SIGPIPE, SIG_DFL); } diff --git a/cde/lib/tt/lib/mp/mp_stream_socket.C b/cde/lib/tt/lib/mp/mp_stream_socket.C index 7ff79a83..caab9e0a 100644 --- a/cde/lib/tt/lib/mp/mp_stream_socket.C +++ b/cde/lib/tt/lib/mp/mp_stream_socket.C @@ -51,9 +51,6 @@ #if defined(OPT_TLI) # include # include -# if defined(OPT_BUG_USL) - extern int t_errno; -# endif #else # include #endif @@ -66,15 +63,6 @@ extern "C" unsigned long inet_addr(char *); #include -#if defined(OPT_BUG_USL) -extern char *t_errlist[]; - -char *t_strerror(int t_errno) -{ - return(t_errlist[t_errno]); -} -#endif - /* * Constructs a socket object. Using (char *)0 for host means use the * current host. Specifying a portnum of 0 indicates that the first @@ -431,9 +419,6 @@ send(char *msg, int len) return(0); } #else -#if defined(OPT_BUG_USL) - t_sync(_sock); -#endif if ((rval = t_snd(_sock, msg, len, 0)) == len) { return(rval); } else { diff --git a/cde/lib/tt/lib/tt_options.h b/cde/lib/tt/lib/tt_options.h index b0c605b8..dd3390bd 100644 --- a/cde/lib/tt/lib/tt_options.h +++ b/cde/lib/tt/lib/tt_options.h @@ -80,9 +80,6 @@ * 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. - * * OPT_XDR_LONG_TYPE -- used for (64-bit) architectures where * defines x_putlong and x_getlong to not take "long*". * @@ -411,49 +408,6 @@ # undef OPT_TAR_HAS_EXCLUDE_OPTION # define OPT_BUG_RPCINTR -#elif defined(USL) -# if !defined(__STDIO_H) -# include -# endif -# undef OPT_UNIX_SOCKET_RPC -# define OPT_TLI -# if defined(PROF) /* can't use dlopen if profiling. */ -# undef OPT_DLOPEN_X11 -# undef OPT_DLOPEN_CE -# else -# define OPT_DLOPEN_X11 -# define OPT_DLOPEN_CE -# endif -# 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_DGETTEXT -# define OPT_CATGETS -# undef OPT_GETDTABLESIZE -# define OPT_SYSINFO -# define OPT_STRERROR -# define OPT_CPP_PATH "/usr/ccs/lib/cpp" -# define OPT_CPP_OPTIONS "" -# define OPT_SVR4_GETMNTENT -/* the reason for locking MNTENT is to sync with the Solaris automounter, - * which doesn't apply on UnixWare. It probably wouldn't hurt to - * do the lockf there, but things seem to be working without it... - */ -# undef OPT_LOCKF_MNTENT -# define OPT_BUG_USL -# if defined(OSMAJORVERSION) && (OSMAJORVERSION > 1) -# define OPT_BUG_UW_2 -# else -# define OPT_BUG_UW_1 -# endif -# define OPT_LOCAL_MOUNT_TYPE "vxfs" -# define OPT_DEFINE_SIG_PF -# define OPT_TAR_HAS_EXCLUDE_OPTION -# define OPT_HAS_REALPATH - #elif defined(__osf__) # define OPT_UNIX_SOCKET_RPC # undef OPT_TLI diff --git a/cde/lib/tt/lib/util/tt_host.C b/cde/lib/tt/lib/util/tt_host.C index d2e03847..d595b201 100644 --- a/cde/lib/tt/lib/util/tt_host.C +++ b/cde/lib/tt/lib/util/tt_host.C @@ -48,7 +48,7 @@ extern "C" in_addr_t inet_addr(const char *); #ifdef __osf__ #include #else -#if !defined(USL) && !defined(linux) && !defined(CSRG_BASED) && !defined(sun) +#if !defined(linux) && !defined(CSRG_BASED) && !defined(sun) #include #endif #endif /* __osf */ diff --git a/cde/lib/tt/lib/util/tt_log.C b/cde/lib/tt/lib/util/tt_log.C index aeb8bf09..df2b2dcf 100644 --- a/cde/lib/tt/lib/util/tt_log.C +++ b/cde/lib/tt/lib/util/tt_log.C @@ -37,7 +37,7 @@ #ifdef __osf__ #include #else -#if !defined (USL) && !defined(linux) && !defined(CSRG_BASED) && !defined(sun) +#if !defined(linux) && !defined(CSRG_BASED) && !defined(sun) #include #endif #endif /* __osf__ */ @@ -45,13 +45,6 @@ #define X_INCLUDE_TIME_H #define XOS_USE_XT_LOCKING #include - -#if defined (USL) -#include -#if defined(OPT_BUG_UW_2) -#include -#endif -#endif #include #include #include diff --git a/cde/lib/tt/lib/util/tt_path.C b/cde/lib/tt/lib/util/tt_path.C index 9d05450b..a2900619 100644 --- a/cde/lib/tt/lib/util/tt_path.C +++ b/cde/lib/tt/lib/util/tt_path.C @@ -59,10 +59,6 @@ #undef rindex #endif -#if defined(OPT_BUG_USL) -#define S_ISLNK(mode) ((mode & 0xF000) == S_IFLNK) -#endif - // Not everybody has realpath() in libc, sometimes we have to define // it ourselves, see realpath*.c in tt/lib diff --git a/cde/lib/tt/lib/util/tt_port.C b/cde/lib/tt/lib/util/tt_port.C index 8175f161..7c00eaf4 100644 --- a/cde/lib/tt/lib/util/tt_port.C +++ b/cde/lib/tt/lib/util/tt_port.C @@ -253,14 +253,11 @@ _tt_sigset( * arguments anyway. sa_sigaction is, fortunately, the same on all * Solaris versions. * Once the requirement to compile on Solaris 2.4 goes away, we can - * simply remove the OPT_BUG_SUNOS_5 ifdefs here, leaving only the - * UnixWare one. + * simply remove the OPT_BUG_SUNOS_5 ifdefs here. */ struct sigaction act; #if defined(OPT_BUG_SUNOS_5) act.sa_sigaction = (void (*)(int, siginfo_t *, void *)) handler; -#elif defined(OPT_BUG_USL) - act.sa_handler = (void (*)()) handler; #else act.sa_handler = handler; #endif @@ -377,7 +374,7 @@ _tt_vsyslog( return; } -#if defined(OPT_BUG_AIX) || defined(OPT_BUG_HPUX) || defined(OPT_BUG_USL) || defined(__osf__) +#if defined(OPT_BUG_AIX) || defined(OPT_BUG_HPUX) || defined(__osf__) char buf[5000]; vsprintf( buf, _format, args ); syslog( priority, buf ); diff --git a/cde/lib/tt/lib/util/tt_port.h b/cde/lib/tt/lib/util/tt_port.h index c84f8bb3..0d452190 100644 --- a/cde/lib/tt/lib/util/tt_port.h +++ b/cde/lib/tt/lib/util/tt_port.h @@ -63,12 +63,6 @@ typedef void (*SIG_PF)(int); #endif -#if defined(OPT_BUG_USL) -#if !defined(MNTTYPE_NFS) -#define MNTTYPE_NFS "nfs" -#endif -#endif - _Tt_string _tt_gethostname(void); int _tt_getdtablesize(void); int _tt_zoomdtablesize(void); diff --git a/cde/lib/tt/lib/util/tt_string.h b/cde/lib/tt/lib/util/tt_string.h index 1ec63d34..78696de8 100644 --- a/cde/lib/tt/lib/util/tt_string.h +++ b/cde/lib/tt/lib/util/tt_string.h @@ -48,7 +48,7 @@ extern "C" { #include }; -#elif defined(OPT_BUG_SUNOS_5) || defined(OPT_BUG_USL) +#elif defined(OPT_BUG_SUNOS_5) #include #include #elif defined(OPT_BUG_AIX) diff --git a/cde/lib/tt/lib/util/tt_xdr_utils.C b/cde/lib/tt/lib/util/tt_xdr_utils.C index 94421f67..b1ae8093 100644 --- a/cde/lib/tt/lib/util/tt_xdr_utils.C +++ b/cde/lib/tt/lib/util/tt_xdr_utils.C @@ -147,14 +147,6 @@ _Tt_xdr_size_stream() { ops.x_putlong = tt_x_putlong; ops.x_putbytes = tt_x_putbytes; ops.x_inline = (inline_t *(*)(...))tt_x_inline; -#elif defined(OPT_BUG_USL) - ops.x_putlong = tt_x_putlong; - ops.x_putbytes = (bool_t (*)(XDR *, caddr_t, u_int)) tt_x_putbytes; -#if defined(OPT_BUG_UW_1) - ops.x_inline = (long *(*)(struct __XDR *, const int)) tt_x_inline; -#else - ops.x_inline = (long *(*)(struct XDR *, int)) tt_x_inline; -#endif /* OPT_BUG_UW1 */ #else ops.x_putlong = tt_x_putlong; ops.x_putbytes = tt_x_putbytes; diff --git a/cde/lib/tt/slib/mp_rpc_server.C b/cde/lib/tt/slib/mp_rpc_server.C index 825b1576..f85e3a3d 100644 --- a/cde/lib/tt/slib/mp_rpc_server.C +++ b/cde/lib/tt/slib/mp_rpc_server.C @@ -51,19 +51,13 @@ static int gettransient(int, netconfig *, netbuf *); #if defined(OPT_BUG_SUNOS_5) extern "C" { char * nc_sperror(); } #endif -# if defined(OPT_BUG_USL) - extern int t_errno; - extern char *t_strerror(int t_errno); -# endif #else #include #include static int gettransient(int,int,int *); #endif /* OPT_TLI */ -#if defined(OPT_BUG_USL) - typedef void (*SERVICE_FN_TYPE)(const struct svc_req *, const SVCXPRT*); -#elif defined(OPT_BUG_AIX) +#if defined(OPT_BUG_AIX) typedef void (*SERVICE_FN_TYPE)(); #else typedef void (*SERVICE_FN_TYPE)(struct svc_req *, SVCXPRT*); diff --git a/cde/programs/dsdm/dsdm.c b/cde/programs/dsdm/dsdm.c index acde0ac3..b6dbb7f3 100644 --- a/cde/programs/dsdm/dsdm.c +++ b/cde/programs/dsdm/dsdm.c @@ -60,21 +60,15 @@ * (2) intersect them with the visible region * (3) append them to the master list * (4) subtract this top-level frame from the visible region - * - * USL changes are #ifdef'd with "oldcode" or commented with *USL* - Sam Chang */ #include #include -#if defined(SVR4) || defined(SYSV) -#include /*USL*/ -#else /* SVR4 or SYSV */ +#if defined(SVR4) +#include +#else /* SVR4 */ #include -#endif /* SVR4 or SYSV */ - -#if !defined(__STDC__) && !defined(__cplusplus) && !defined(c_plusplus) /*USL*/ -#define void char -#endif +#endif /* SVR4 */ #define XFreeDefn char * @@ -150,102 +144,19 @@ typedef struct { #define REGION_NUMRECTS(r) (((REGION *)(r))->numRects) - - -#ifdef DEBUG /*USL*/ -/* - * Flash the visible region. Useful for debugging. - */ -void -FlashRegion(Display *dpy, int s, GC gc) -{ - XEvent e; - Bool done = False; - Window root = RootWindow(dpy, s); - - if (GrabSuccess != XGrabPointer(dpy, root, False, - ButtonPressMask, GrabModeAsync, GrabModeAsync, - None, None, CurrentTime)) { - fputs("can't grab the pointer\n", stderr); - return; - } - - do { - XFillRectangle(dpy, root, gc, 0, 0, - DisplayWidth(dpy, s), - DisplayHeight(dpy, s)); - XFlush(dpy); - - XMaskEvent(dpy, ButtonPressMask, &e); - if (e.xbutton.button == Button3) - done = True; - - XFillRectangle(dpy, root, gc, 0, 0, - DisplayWidth(dpy, s), - DisplayHeight(dpy, s)); - XFlush(dpy); - } while (!done); - XUngrabPointer(dpy, CurrentTime); -} /* end of FlashRegion */ - - -void -FlashDropSites(Display *dpy) -{ - drop_site_t *site = MasterSiteList; - XGCValues gcv; - GC *gcs; - int s; - GC gc; - - gcv.function = GXinvert; - gcv.subwindow_mode = IncludeInferiors; - - gcs = (GC *) malloc(sizeof(GC)*ScreenCount(dpy)); - for (s=0; ssite_id, site->window_id, site->flags); - gc = gcs[site->screen]; - XSetRegion(dpy, gc, site->region); - FlashRegion(dpy, site->screen, gc); - site = site->next; - } - - for (s=0; s 0) { /* XXX didn't read it all, punt */ fputs("dsdm: interest property too long\n", stderr); -#ifdef oldcode - XFree(data); -#else XFree((XFreeDefn) data); -#endif return NULL; } return data; @@ -304,11 +207,7 @@ FindRecursively(Display *dpy, Window root, Window win, Window *pwin, void **psit int actfmt; unsigned long nitems; unsigned long remain; -#ifdef oldcode - void *data; -#else - unsigned char * data; -#endif + unsigned char * data; Status s; if (XGetWindowAttributes(dpy, win, &attr) == 0) { @@ -327,11 +226,7 @@ FindRecursively(Display *dpy, Window root, Window win, Window *pwin, void **psit if (!XTranslateCoordinates(dpy, win, root, 0, 0, px, py, &junk)) { fprintf(stderr, "%s: window 0x%lx isn't on the same root!\n", ProgramName, win); -#ifdef oldcode - XFree(data); -#else XFree((XFreeDefn) data); -#endif return False; } *psite = (void *) data; @@ -353,11 +248,7 @@ FindRecursively(Display *dpy, Window root, Window win, Window *pwin, void **psit /* found it! */ DPRINTF(("%s: found top-level window 0x%lx with no interest\n", ProgramName, win)); -#ifdef oldcode - XFree(data); -#else XFree((XFreeDefn) data); -#endif *psite = NULL; *plen = 0; @@ -408,11 +299,7 @@ FindRecursively(Display *dpy, Window root, Window win, Window *pwin, void **psit return True; } -#ifdef oldcode - return(SearchChildren(dpy, root, win, pwin, psite, plen, px, py)); -#else return(SearchChildren(dpy, root, win, pwin, psite, plen, px, py, True)); -#endif } /* end of FindRecursively */ @@ -421,19 +308,11 @@ FindRecursively(Display *dpy, Window root, Window win, Window *pwin, void **psit * Look through all the children of window win for a top-level window. */ Bool -#ifdef oldcode -SearchChildren(Display *dpy, Window root, Window win, Window *pwin, void **psite, unsigned long *plen, int *px, int *py) -#else SearchChildren(Display *dpy, Window root, Window win, Window *pwin, void **psite, unsigned long *plen, int *px, int *py, Bool from_FindRec) -#endif { Window junk; Window *children; -#ifdef oldcode - int nchildren; -#else unsigned int nchildren; -#endif int i; if (XQueryTree(dpy, win, &junk, &junk, &children, &nchildren) == 0) @@ -441,20 +320,14 @@ SearchChildren(Display *dpy, Window root, Window win, Window *pwin, void **psite for (i=0; inext; -#ifdef oldcode - free(next); -#else if (next->region) XDestroyRegion(next->region); XFree((XFreeDefn)next); -#endif next = temp; } MasterSiteList = NULL; @@ -824,11 +655,7 @@ WriteSiteRectList(Display *dpy, Window win, Atom prop) } /* XXX beware of malloc(0) */ -#ifdef oldcode - array = (unsigned long *) malloc(8*numrects*sizeof(int)); -#else array = (unsigned long *) malloc(8*numrects*sizeof(unsigned long)); -#endif cur = array; site = MasterSiteList; while (site != NULL) { @@ -857,13 +684,8 @@ WriteSiteRectList(Display *dpy, Window win, Atom prop) } XChangeProperty(dpy, win, prop, XA_INTEGER, 32, PropModeReplace, -#ifdef oldcode - (char *)array, cur - array); - free(array); -#else (unsigned char *)array, cur - array); XFree((XFreeDefn)array); -#endif } /* end of WriteSiteRectList */ diff --git a/cde/programs/dtaction/Imakefile b/cde/programs/dtaction/Imakefile index 3bc7884a..c1cb7fff 100644 --- a/cde/programs/dtaction/Imakefile +++ b/cde/programs/dtaction/Imakefile @@ -24,18 +24,10 @@ SYS_LIBRARIES = -lm -lcrypt SYS_LIBRARIES = -lm -lcrypt #endif -#ifdef SCOArchitecture -SYS_LIBRARIES = -lm -lcrypt -#endif - #ifdef RsArchitecture SYS_LIBRARIES = -liconv #endif -#ifdef USLArchitecture -SYS_LIBRARIES = -lm -lgen -#endif - #if defined(SunArchitecture) SYS_LIBRARIES = -lm -ldl #endif diff --git a/cde/programs/dtaction/Main.c b/cde/programs/dtaction/Main.c index 68ed1645..8920f7c4 100644 --- a/cde/programs/dtaction/Main.c +++ b/cde/programs/dtaction/Main.c @@ -1006,9 +1006,7 @@ LogSuccess( void ) /* Set up the user's new id's */ SetGidUid(basegid,newuid); -#ifndef sco initgroups(appArgs.user, basegid); -#endif } diff --git a/cde/programs/dtaction/demo/Makefile.usl b/cde/programs/dtaction/demo/Makefile.usl deleted file mode 100644 index d3d47863..00000000 --- a/cde/programs/dtaction/demo/Makefile.usl +++ /dev/null @@ -1,51 +0,0 @@ -# $XConsortium: Makefile.usl /main/2 1996/05/13 11:30:23 drk $ -########################################################################### -# -# Makefile for dtactiondemo.c -# -# (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 Unix System Labs, Inc., a subsidiary of -# Novell, Inc. -########################################################################### - -#ifndef CDE_INSTALLATION_TOP - CDE_INSTALLATION_TOP = /usr/dt -#endif - -PROGRAM = dtactiondemo -SOURCES = dtactiondemo.c -OBJECTS = dtactiondemo.o - -OPTIMIZEDFLAGS = -O - -DTINCLUDE = -I$(CDE_INSTALLATION_TOP)/include -X11INCLUDE = -I/usr/X/include -INCLUDES = $(DTINCLUDE) $(X11INCLUDE) - -DTSVCLIB = -L$(CDE_INSTALLATION_TOP)/lib -lDtSvc -XMLIB = -L$(CDE_INSTALLATION_TOP)/lib -lXm -XTLIB = -L$(CDE_INSTALLATION_TOP)/lib -lXt -X11LIB = -L/usr/X/lib -lX11 -CPLUSPLUS = -L/usr/add-on/C++/lib -lC -EXTRA_LIBS = -L/usr/lib -lw -lgen -lnsl -lresolv -lsocket \ - -lXIM -L/usr/add-on/C++/lib -lC - -LIBRARIES = $(DTSVCLIB) $(XMLIB) $(XTLIB) \ - $(X11LIB) $(CPLUSPLUS) $(EXTRA_LIBS) - -#LDFLAGS = -R$(CDE_INSTALLATION_TOP)/lib:/usr/X/lib - -.c.o: - cc -c $(OPTIMIZEDFLAGS) $(INCLUDES) $< - -all:: $(PROGRAM) - -$(PROGRAM):: $(OBJECTS) - cc -o $(PROGRAM) $(LDFLAGS) $(OBJECTS) $(LIBRARIES) - -clean:: - rm -f $(PROGRAM) - rm -f $(OBJECTS) - diff --git a/cde/programs/dtappbuilder/src/ab.tmpl b/cde/programs/dtappbuilder/src/ab.tmpl index 502d92da..df434957 100644 --- a/cde/programs/dtappbuilder/src/ab.tmpl +++ b/cde/programs/dtappbuilder/src/ab.tmpl @@ -58,9 +58,7 @@ clean:: $(RM) .make.* #endif -#if defined(USLArchitecture) -EXTRA_DEFINES = -D_POSIX_SOURCE=1 -#elif defined(AlphaArchitecture) +#if defined(AlphaArchitecture) EXTRA_DEFINES = -D_XOPEN_SOURCE=1 -D_OSF_SOURCE=1 /* default storage(40000) is not enough to process ./src/libABil/bil_parse.y */ YACCFLAGS = -N100000 diff --git a/cde/programs/dtappbuilder/src/ab/Imakefile b/cde/programs/dtappbuilder/src/ab/Imakefile index 300b22c6..c77297f2 100644 --- a/cde/programs/dtappbuilder/src/ab/Imakefile +++ b/cde/programs/dtappbuilder/src/ab/Imakefile @@ -179,7 +179,6 @@ AB_MAKEFILES = \ Makefile.hpux \ Makefile.sunos \ Makefile.osf1 \ - Makefile.unixware \ Makefile.linux \ Makefile.freebsd \ Makefile.netbsd \ diff --git a/cde/programs/dtappbuilder/src/abmf/make_file.c b/cde/programs/dtappbuilder/src/abmf/make_file.c index f3590a1c..1580983c 100644 --- a/cde/programs/dtappbuilder/src/abmf/make_file.c +++ b/cde/programs/dtappbuilder/src/abmf/make_file.c @@ -101,7 +101,6 @@ static int write_os_params( static int write_aix_stuff(File makeFile, AbmfLibs libs); static int write_hpux_stuff(File makeFile, AbmfLibs libs); static int write_sunos_params(File makeFile, AbmfLibs libs); -static int write_unixware_params(File makeFile, AbmfLibs libs); static int write_osf1_stuff(File makeFile, AbmfLibs libs); static int write_lnx_params(File makeFile, AbmfLibs libs); static int write_fbsd_params(File makeFile, AbmfLibs libs); @@ -111,7 +110,6 @@ static int write_obsd_params(File makeFile, AbmfLibs libs); static int determine_aix_libs(AbmfLibs libs, ABObj project); static int determine_hpux_libs(AbmfLibs libs, ABObj project); static int determine_sunos_libs(AbmfLibs libs, ABObj project); -static int determine_unixware_libs(AbmfLibs libs, ABObj project); static int determine_osf1_libs(AbmfLibs libs, ABObj project); static int determine_lnx_libs(AbmfLibs libs, ABObj project); static int determine_fbsd_libs(AbmfLibs libs, ABObj project); @@ -212,12 +210,7 @@ determine_libs(AbmfLibs libs, ABObj project, AB_OS_TYPE osType) lib_add(libs, LibDtHelp, ABMF_LIB_PREPEND, ABMF_LIB_REJECT_DUP); lib_add(libs, LibDtTerm, ABMF_LIB_PREPEND, ABMF_LIB_REJECT_DUP); } - -#if defined(USL) - if (1) /* Workaround because tooltalk not being used when needed */ -#else if (obj_get_tooltalk_level(project) != AB_TOOLTALK_NONE) -#endif lib_add(libs, LibTt, ABMF_LIB_APPEND, ABMF_LIB_REJECT_DUP); switch(osType) @@ -236,9 +229,6 @@ determine_libs(AbmfLibs libs, ABObj project, AB_OS_TYPE osType) case AB_OS_OSF1: return_value = determine_osf1_libs(libs, project); break; - case AB_OS_UNIXWARE: - return_value = determine_unixware_libs(libs, project); - break; case AB_OS_LNX: return_value = determine_lnx_libs(libs, project); break; @@ -286,12 +276,6 @@ determine_osf1_libs(AbmfLibs libs, ABObj project) return 0; } -static int -determine_unixware_libs(AbmfLibs libs, ABObj project) -{ - return 0; -} - static int determine_lnx_libs(AbmfLibs libs, ABObj project) { @@ -511,10 +495,6 @@ write_os_params( return_value = write_sunos_params(makeFile, libs); break; - case AB_OS_UNIXWARE: - return_value = write_unixware_params(makeFile, libs); - break; - case AB_OS_OSF1: return_value = write_osf1_stuff(makeFile, libs); break; @@ -721,47 +701,6 @@ write_osf1_stuff(File makeFile, AbmfLibs libs) return 0; } -static int -write_unixware_params(File makeFile, AbmfLibs libs) -{ - STRING osName = util_os_type_to_string(AB_OS_UNIXWARE); - - abio_printf(makeFile, - "\n" -"###########################################################################\n" -"# These are the %s-dependent configuration parameters that must be\n" -"# set in order for any application to build.\n" -"###########################################################################\n", - osName); - - abio_puts(makeFile, "\n"); - abio_puts(makeFile, -" RM = rm -f\n" -" INCLUDES = -I/usr/dt/include -I/X11/include\n" -"\n" -" STD_DEFINES = \n" -" ANSI_DEFINES = \n" -"\n" -" CDEBUGFLAGS = -O\n" -" SYS_LIBRARIES = -lnsl -lsocket -lm -ldl -lgen -lresolv -lw\n" -" CDE_LIBPATH = /usr/dt/lib\n" -" CDE_LDFLAGS = -L$(CDE_LIBPATH)\n" -" ALLX_LIBPATH = /X11/lib\n" -" ALLX_LDFLAGS = -L$(ALLX_LIBPATH)\n"); - - write_local_libraries(makeFile, libs, AB_OS_UNIXWARE); - - abio_puts(makeFile, -" CFLAGS = $(CDEBUGFLAGS) -D_POSIX_SOURCE=1 $(INCLUDES) $(STD_DEFINES)" - " $(ANSI_DEFINES)\n" -" LDLIBS = $(SYS_LIBRARIES)\n" -" LDOPTIONS = $(CDE_LDFLAGS) $(ALLX_LDFLAGS)\n" -"\n" -); - - return 0; -} - static int write_lnx_params(File makeFile, AbmfLibs libs) { @@ -1280,7 +1219,7 @@ write_targets( "scour:\n" " $(RM) $(CLEAN_FILES) $(TARGETS.h.merged) $(TARGETS.c.merged) \\\n" " Makefile Makefile.aix Makefile.hpux Makefile.sunos \\\n" -" Makefile.osf1 Makefile.unixware Makefile.linux \\\n" +" Makefile.osf1 Makefile.linux \\\n" " Makefile.freebsd Makefile.netbsd Makefile.openbsd\n" ); diff --git a/cde/programs/dtappbuilder/src/libABobj/obj.c b/cde/programs/dtappbuilder/src/libABobj/obj.c index 8771f5f7..07099de3 100644 --- a/cde/programs/dtappbuilder/src/libABobj/obj.c +++ b/cde/programs/dtappbuilder/src/libABobj/obj.c @@ -459,15 +459,8 @@ obj_alloc_unique_name_for_child( { maxlen = 8192; } -#if defined (USL) - /* - * The USL specific changes were added ifdef due to time constraints - * They should be removed in the next release - */ - maxlen = util_min(8191,maxlen); /* don't overrun buf */ -#else + maxlen = util_min(8192,maxlen); /* don't overrun buf */ -#endif /* * Alloc space and copy-in the unique name @@ -494,11 +487,7 @@ obj_alloc_unique_name_istr_for_child( { maxlen = 8192; } -#if defined (USL) - maxlen = util_min(8191,maxlen); -#else maxlen = util_min(8192,maxlen); -#endif unique_name = istr_create( obj_get_unique_name_for_child(obj, istr_string(name), maxlen-1, nameBuf)); diff --git a/cde/programs/dtappbuilder/src/libAButil/util.c b/cde/programs/dtappbuilder/src/libAButil/util.c index f9651e4a..58c83670 100644 --- a/cde/programs/dtappbuilder/src/libAButil/util.c +++ b/cde/programs/dtappbuilder/src/libAButil/util.c @@ -250,7 +250,6 @@ util_get_os_type(void) int aixIndex = -1; int hpIndex = -1; int sunIndex = -1; - int unixwareIndex = -1; int osf1Index = -1; int lnxIndex = -1; int fbsdIndex = -1; @@ -269,7 +268,6 @@ util_get_os_type(void) aixIndex = util_strcasestr(sysInfo.sysname, "aix"); hpIndex = util_strcasestr(sysInfo.sysname, "hp"); sunIndex = util_strcasestr(sysInfo.sysname, "sun"); - unixwareIndex = util_strcasestr(sysInfo.sysname, "UNIX_SV"); osf1Index = util_strcasestr(sysInfo.sysname, "osf1"); lnxIndex = util_strcasestr(sysInfo.sysname, "linux"); fbsdIndex = util_strcasestr(sysInfo.sysname, "freebsd"); @@ -279,59 +277,53 @@ util_get_os_type(void) if (aixIndex < 0) aixIndex = INT_MAX; if (hpIndex < 0) hpIndex = INT_MAX; if (sunIndex < 0) sunIndex = INT_MAX; - if (unixwareIndex < 0) unixwareIndex = INT_MAX; if (osf1Index < 0) osf1Index = INT_MAX; if (lnxIndex < 0) lnxIndex = INT_MAX; if (fbsdIndex < 0) fbsdIndex = INT_MAX; if (nbsdIndex < 0) nbsdIndex = INT_MAX; if (obsdIndex < 0) obsdIndex = INT_MAX; -#define IS_MATCH(a,b,c,d,e,f,g,h,i) \ +#define IS_MATCH(a,b,c,d,e,f,g,h) \ (((a) < (b)) && ((a) < (c)) && ((a) < (d)) && ((a) < (e)) && ((a) < (f)) && \ - ((a) < (g)) && ((a) < (h)) && ((a) < (i))) + ((a) < (g)) && ((a) < (h))) - if (IS_MATCH(aixIndex, hpIndex, sunIndex, osf1Index, unixwareIndex, + if (IS_MATCH(aixIndex, hpIndex, sunIndex, osf1Index, lnxIndex, fbsdIndex, nbsdIndex, obsdIndex)) { return AB_OS_AIX; } - if (IS_MATCH(hpIndex, aixIndex, sunIndex, osf1Index, unixwareIndex, + if (IS_MATCH(hpIndex, aixIndex, sunIndex, osf1Index, lnxIndex, fbsdIndex, nbsdIndex, obsdIndex)) { return AB_OS_HPUX; } - if (IS_MATCH(sunIndex, aixIndex, hpIndex, osf1Index, unixwareIndex, + if (IS_MATCH(sunIndex, aixIndex, hpIndex, osf1Index, lnxIndex, fbsdIndex, nbsdIndex, obsdIndex)) { return AB_OS_SUNOS; } - if (IS_MATCH(osf1Index, aixIndex, hpIndex, sunIndex, unixwareIndex, + if (IS_MATCH(osf1Index, aixIndex, hpIndex, sunIndex, lnxIndex, fbsdIndex, nbsdIndex, obsdIndex)) { return AB_OS_OSF1; } - if (IS_MATCH(unixwareIndex, aixIndex, hpIndex, sunIndex, osf1Index, - lnxIndex, fbsdIndex, nbsdIndex, obsdIndex)) - { - return AB_OS_UNIXWARE; - } if (IS_MATCH(lnxIndex, aixIndex, hpIndex, sunIndex, osf1Index, - unixwareIndex, fbsdIndex, nbsdIndex, obsdIndex)) + fbsdIndex, nbsdIndex, obsdIndex)) { return AB_OS_LNX; } if (IS_MATCH(fbsdIndex, aixIndex, hpIndex, sunIndex, osf1Index, - unixwareIndex, lnxIndex, nbsdIndex, obsdIndex)) + lnxIndex, nbsdIndex, obsdIndex)) { return AB_OS_FBSD; } if (IS_MATCH(nbsdIndex, aixIndex, hpIndex, sunIndex, osf1Index, - unixwareIndex, lnxIndex, fbsdIndex, obsdIndex)) + lnxIndex, fbsdIndex, obsdIndex)) { return AB_OS_NBSD; } if (IS_MATCH(obsdIndex, aixIndex, hpIndex, sunIndex, osf1Index, - unixwareIndex, lnxIndex, fbsdIndex, nbsdIndex)) + lnxIndex, fbsdIndex, nbsdIndex)) { return AB_OS_OBSD; } diff --git a/cde/programs/dtappbuilder/src/libAButil/util.h b/cde/programs/dtappbuilder/src/libAButil/util.h index 82cbd96a..8fabba78 100644 --- a/cde/programs/dtappbuilder/src/libAButil/util.h +++ b/cde/programs/dtappbuilder/src/libAButil/util.h @@ -82,7 +82,6 @@ typedef enum AB_OS_AIX, AB_OS_SUNOS, AB_OS_OSF1, - AB_OS_UNIXWARE, AB_OS_LNX, AB_OS_FBSD, AB_OS_NBSD, diff --git a/cde/programs/dtappbuilder/src/libAButil/util_convert.c b/cde/programs/dtappbuilder/src/libAButil/util_convert.c index 3a9a9bd6..7c885b3f 100644 --- a/cde/programs/dtappbuilder/src/libAButil/util_convert.c +++ b/cde/programs/dtappbuilder/src/libAButil/util_convert.c @@ -854,7 +854,6 @@ util_os_type_to_ident(AB_OS_TYPE osType) case AB_OS_AIX: typeString = "aix"; break; case AB_OS_HPUX: typeString = "hpux"; break; case AB_OS_SUNOS: typeString = "sunos"; break; - case AB_OS_UNIXWARE: typeString = "unixware"; break; case AB_OS_OSF1: typeString = "osf1"; break; case AB_OS_LNX: typeString = "linux"; break; case AB_OS_FBSD: typeString = "freebsd"; break; @@ -879,7 +878,6 @@ util_os_type_to_string(AB_OS_TYPE osType) case AB_OS_AIX: nameString = "AIX"; break; case AB_OS_HPUX: nameString = "HP-UX"; break; case AB_OS_SUNOS: nameString = "SunOS"; break; - case AB_OS_UNIXWARE: nameString = "UnixWare"; break; case AB_OS_OSF1: nameString = "OSF/1"; break; case AB_OS_LNX: nameString = "Linux"; break; case AB_OS_FBSD: nameString = "FreeBSD"; break; diff --git a/cde/programs/dtcalc/Imakefile b/cde/programs/dtcalc/Imakefile index 9350ff0d..2b66f7aa 100644 --- a/cde/programs/dtcalc/Imakefile +++ b/cde/programs/dtcalc/Imakefile @@ -21,10 +21,6 @@ SYS_LIBRARIES = -lmsaa -liconv SYS_LIBRARIES = -lintl -lm -ldl #endif -#if defined (USLArchitecture) -SYS_LIBRARIES = -lm -lgen -#endif - #if defined(HPOSFArchitecture) #endif diff --git a/cde/programs/dtcalc/functions.c b/cde/programs/dtcalc/functions.c index ef7a7703..a6a6328b 100644 --- a/cde/programs/dtcalc/functions.c +++ b/cde/programs/dtcalc/functions.c @@ -1733,14 +1733,8 @@ do_round(double result, int ndigits) temp = finite(result); if (!temp) return (temp > 0) ? HUGE : -HUGE; -#else -#if defined(USL) - temp = finite(result); - if (!temp) - return (temp > 0) ? HUGE : -HUGE; #else if ((temp = isinf(result))) return (temp > 0) ? HUGE : -HUGE; -#endif /* USL */ #endif /* _AIX or __osf__ */ if (ndigits >= 0 && ndigits < MAX_DIGITS) @@ -1852,14 +1846,9 @@ try_compute_i(double guess, double *result, int method) #if defined(_AIX) || defined(__aix) || defined (__osf__) || defined(__sparc) if (!(!isnan(new_w) && finite(new_w))) return FALSE; -#else -#if defined(USL) - if (!(!isnan(new_w) && finite(new_w))) - return FALSE; #else if (!(!isnan(new_w) && !isinf(new_w))) return FALSE; -#endif #endif /* _AIX or __osf__ */ if (new_w == w || (w != 0.0 && fabs((new_w - w) / w) < FIN_EPSILON)) diff --git a/cde/programs/dtcm/dtcm/Imakefile b/cde/programs/dtcm/dtcm/Imakefile index c9f77d6e..7ebed1d8 100644 --- a/cde/programs/dtcm/dtcm/Imakefile +++ b/cde/programs/dtcm/dtcm/Imakefile @@ -17,7 +17,7 @@ LOCAL_LIBRARIES = ../libDtCmP/libDtCmP.a $(CSALIB) DtClientLibs -DRELMAJOR="$(OSMAJORVERSION)" -DRELMINOR="$(OSMINORVERSION)" \ $(ICONV_INBUF_DEFINE) -#if defined(RsArchitecture) || defined(USLArchitecture) || defined(LinuxArchitecture) || defined(BSDArchitecture) +#if defined(RsArchitecture) || defined(LinuxArchitecture) || defined(BSDArchitecture) TTY_LIBRARIES = $(LOCAL_LIBRARIES) #elif defined(AlphaArchitecture) TTY_LIBRARIES = $(DTCMPLIB) $(CSALIB) $(DTSVCLIB) $(XTOOLLIB) $(XLIB) diff --git a/cde/programs/dtcm/libDtCmP/util.c b/cde/programs/dtcm/libDtCmP/util.c index dd6400c6..67490123 100644 --- a/cde/programs/dtcm/libDtCmP/util.c +++ b/cde/programs/dtcm/libDtCmP/util.c @@ -59,17 +59,13 @@ #include #include #include /* SYS_NMLN */ -#if defined(sun) || defined(USL) +#if defined(sun) #include #else #include -#endif /* sun || USL */ +#endif /* sun */ #include -#if defined(USL) && !defined(DOM_NM_LN) -#define DOM_NM_LN BUFSIZ -#endif - #define X_INCLUDE_STRING_H #define X_INCLUDE_TIME_H #define XOS_USE_NO_LOCKING @@ -548,13 +544,13 @@ cm_get_local_host() static char *local_host; if (local_host == NULL) { -#if defined(sun) || defined(USL) +#if defined(sun) local_host = (char *)ckalloc(MAXHOSTNAMELEN); (void) sysinfo(SI_HOSTNAME, local_host, MAXHOSTNAMELEN); #else local_host = (char *)ckalloc(MAXHOSTNAMELEN); (void) gethostname(local_host, MAXHOSTNAMELEN); -#endif /* sun || USL */ +#endif /* sun */ } return local_host; } @@ -582,14 +578,14 @@ cm_get_local_domain() if (local_domain == NULL) { local_domain = ckalloc(BUFSIZ); -#if defined(sun) || defined(USL) +#if defined(sun) sysinfo(SI_SRPC_DOMAIN, local_domain, DOM_NM_LN); #else if(-1 == getdomainname(local_domain, BUFSIZ)) { fprintf(stderr, "getdomainname() failed %d '%s'\n", errno, strerror(errno)); } -#endif /* sun || USL */ +#endif /* sun */ } return(local_domain); } diff --git a/cde/programs/dtcm/server/lexit.c b/cde/programs/dtcm/server/lexit.c index 496d6e7a..04184ed8 100644 --- a/cde/programs/dtcm/server/lexit.c +++ b/cde/programs/dtcm/server/lexit.c @@ -428,7 +428,7 @@ setinput (FILE* f) return(-1); } -#if !defined(USL) && !defined(linux) +#if !defined(linux) /* no madvise so we lose this optimization */ madvise(start_of_mmapped_area, len, MADV_SEQUENTIAL); #endif diff --git a/cde/programs/dtcm/server/svcmain.c b/cde/programs/dtcm/server/svcmain.c index d9774687..d26de082 100644 --- a/cde/programs/dtcm/server/svcmain.c +++ b/cde/programs/dtcm/server/svcmain.c @@ -46,12 +46,12 @@ #endif /* _NETINET_IN_H */ #endif -#if defined(SunOS) || defined(USL) +#if defined(SunOS) #include #include #include #include -#endif /* SunOS || USL */ +#endif /* SunOS */ #include #include #include @@ -521,14 +521,12 @@ main(int argc, char **argv) SVCXPRT *udp_transp = (SVCXPRT *)-1; int fd, error; -#if defined(SunOS) || defined(USL) +#if defined(SunOS) struct netconfig *nconf_udp; struct netconfig *nconf_tcp; struct t_info info; -#if !defined(USL) || (defined(USL) && (OSMAJORVERSION > 1)) char mname[FMNAMESZ+1]; -#endif -#endif /* SunOS || USL */ +#endif /* SunOS */ pw = (struct passwd *)getpwnam("daemon"); gr = (struct group *)getgrnam("daemon"); @@ -548,8 +546,7 @@ main(int argc, char **argv) standalone = 0; -#if defined(SunOS) || defined(USL) -#if !defined(USL) || (defined(USL) && (OSMAJORVERSION > 1)) +#if defined(SunOS) /* we need a TLI endpoint rather than a socket */ if (ioctl(0, I_LOOK, mname) != 0) { perror("rpc.cmsd: ioctl failed to get module name"); @@ -565,17 +562,11 @@ main(int argc, char **argv) fprintf(stderr, "rpc.cmsd: fd 0 is not timod\n"); exit(1); } -#else /* !USL || (USL && OSMAJORVERSION > 1) */ - if (ioctl(0, I_POP, 0) || ioctl(0, I_PUSH, "timod")) { - perror("rpc.cmsd: ioctl I_POP/I_PUSH failed"); - exit(1); - } -#endif /* !USL || (USL && OSMAJORVERSION > 1) */ } else if (t_getinfo(0, &info) == 0) { standalone = 0; -#endif /* SunOS || USL */ +#endif /* SunOS */ } else standalone = 1; @@ -621,7 +612,7 @@ main(int argc, char **argv) signal(SIGHUP, sighup_handler); -#if defined(SunOS) || defined(USL) +#if defined(SunOS) /* raise the soft limit of number of file descriptor */ /* this is to prevent the backend from running out of open file des */ getrlimit(RLIMIT_NOFILE, &rl); @@ -629,7 +620,7 @@ main(int argc, char **argv) setrlimit(RLIMIT_NOFILE, &rl); #endif -#if defined(SunOS) || defined(USL) +#if defined(SunOS) nconf_udp = getnetconfigent("udp"); nconf_tcp = getnetconfigent("tcp"); @@ -749,7 +740,7 @@ main(int argc, char **argv) } } -#endif /* SunOS || USL */ +#endif /* SunOS */ #ifndef AIX #ifdef HPUX diff --git a/cde/programs/dtcm/server/utility.c b/cde/programs/dtcm/server/utility.c index 6b7a15e8..7fc63d46 100644 --- a/cde/programs/dtcm/server/utility.c +++ b/cde/programs/dtcm/server/utility.c @@ -33,7 +33,7 @@ #include #include #include -#if defined(SunOS) || defined(USL) +#if defined(SunOS) #include #include #endif diff --git a/cde/programs/dtcreate/Imakefile b/cde/programs/dtcreate/Imakefile index 2acc9997..dc27bd09 100644 --- a/cde/programs/dtcreate/Imakefile +++ b/cde/programs/dtcreate/Imakefile @@ -46,11 +46,6 @@ SYS_LIBRARIES = -lm -liconv SYS_LIBRARIES = -lm -ldl #endif /* SunArchitecture */ -#if defined (USLArchitecture) -EXTRA_DEFINES = -D_NO_PROTO -SYS_LIBRARIES = -lm -ldl -lgen -#endif /* SunArchitecture */ - SRCS = \ main.c \ AddFiletype.c \ diff --git a/cde/programs/dtcreate/icon_selection_dialog.c b/cde/programs/dtcreate/icon_selection_dialog.c index ddb1fb31..d6010502 100644 --- a/cde/programs/dtcreate/icon_selection_dialog.c +++ b/cde/programs/dtcreate/icon_selection_dialog.c @@ -32,10 +32,6 @@ #include #include -#if defined(USL) -#define S_ISLNK(mode) ((mode & S_IFMT) == S_IFLNK) -#endif - #include #include #include diff --git a/cde/programs/dtdbcache/Imakefile b/cde/programs/dtdbcache/Imakefile index 3c089fe9..e6375b84 100644 --- a/cde/programs/dtdbcache/Imakefile +++ b/cde/programs/dtdbcache/Imakefile @@ -30,20 +30,10 @@ SYS_LIBRARIES = -lm EXTRA_DEFINES = +e #endif -#ifdef SCOArchitecture -ATLIB= -SYS_LIBRARIES = -lm -lcrypt -#endif - #ifdef RsArchitecture ATLIB= #endif -#ifdef USLArchitecture -SYS_LIBRARIES = -lm -lgen -ATLIB= -#endif - #if defined(HPOSFArchitecture) #endif diff --git a/cde/programs/dtdocbook/instant/Imakefile b/cde/programs/dtdocbook/instant/Imakefile index 9d52f5d5..9330fd4d 100644 --- a/cde/programs/dtdocbook/instant/Imakefile +++ b/cde/programs/dtdocbook/instant/Imakefile @@ -6,7 +6,7 @@ INCLUDES = -I../lib/tptregexp -I../tcl -I$(XLATESRC) DEPLIBS = $(DEPDTSVCLIB) LOCAL_LIBRARIES = $(DTSVCLIB) $(TTLIB) $(XMLIB) $(XTOOLLIB) $(XLIB) \ -L../lib/tptregexp -ltptregexp ../tcl/libtcl.a -#if defined(SunArchitecture) || defined(USLArchitecture) +#if defined(SunArchitecture) EXTRA_LIBRARIES = -lsocket -lnsl -lgen -lm #else EXTRA_LIBRARIES = -lm diff --git a/cde/programs/dtdocbook/sgmls/Imakefile b/cde/programs/dtdocbook/sgmls/Imakefile index 1b14bf28..a73e9608 100644 --- a/cde/programs/dtdocbook/sgmls/Imakefile +++ b/cde/programs/dtdocbook/sgmls/Imakefile @@ -40,14 +40,6 @@ HDRS=action.h adl.h entity.h error.h etype.h sgmldecl.h keyword.h lextoke.h \ PROGRAMS = $(PROG1) $(PROG2) $(PROG3) -#ifdef USLArchitecture -/* work around likely optimizer problem */ -context.o: context.c - RemoveFile($@) - ClearmakeOSName - $(CC) -c $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES) $*.c -#endif - ComplexProgramTarget_1(sgmls,,) ComplexProgramTarget_2(sgmlsasp,,) ComplexProgramTarget_3(rast,,) diff --git a/cde/programs/dtdspmsg/Imakefile b/cde/programs/dtdspmsg/Imakefile index fba01933..d4426641 100644 --- a/cde/programs/dtdspmsg/Imakefile +++ b/cde/programs/dtdspmsg/Imakefile @@ -6,10 +6,6 @@ SYS_LIBRARIES = -lm $(DYNLIBSYSLIB) $(REGEXSYSLIB) EXTRA_DEFINES = +e #endif -#ifdef SCOArchitecture -SYS_LIBRARIES = -lm -lcrypt -#endif - PROGRAMS=dtdspmsg SRCS = dtdspmsg.c diff --git a/cde/programs/dtfile/FileManip.c b/cde/programs/dtfile/FileManip.c index d2289654..9bb95f78 100644 --- a/cde/programs/dtfile/FileManip.c +++ b/cde/programs/dtfile/FileManip.c @@ -51,24 +51,15 @@ **************************************************************************** ************************************<+>*************************************/ -#if defined(SVR4) || defined(sco) -# if defined(USL) || defined(sco) -# include -# include -# endif -# ifdef sco -# include -# define ROOTINO S5ROOTINO -# else +#if defined(SVR4) # include # define ROOTINO UFSROOTINO -# endif /* sco */ #else # if defined(linux) || defined(CSRG_BASED) # define ROOTINO 2 # endif # include -#endif /* SVR4 || sco */ +#endif /* SVR4 */ #include @@ -1000,7 +991,7 @@ FileManip( (((s3.st_mode & S_IFMT) == S_IFDIR) /* if is a directory */ || ((s3.st_mode & S_IFMT) == S_IFSOCK)) ) /* or a net special */ #else -#if defined(SVR4) || defined(_AIX) || defined(sco) +#if defined(SVR4) || defined(_AIX) ((s3.st_mode & S_IFMT) == S_IFDIR) ) /* if is a directory */ #else /* (__hpux) */ (((s3.st_mode & S_IFMT) == S_IFDIR) /* if is a directory */ diff --git a/cde/programs/dtfile/Find.c b/cde/programs/dtfile/Find.c index 4c5edd35..5c889569 100644 --- a/cde/programs/dtfile/Find.c +++ b/cde/programs/dtfile/Find.c @@ -1727,7 +1727,7 @@ ExecuteFind( XmString label_string; char *tmpStr; Arg args[1]; -#if defined (SVR4) || defined(_AIX) || defined(sco) +#if defined (SVR4) || defined(_AIX) /* needed for getaccess () call */ int save_ruid; int save_rgid; @@ -1797,22 +1797,22 @@ ExecuteFind( return False; } /* Verify that the path exists and is accessible */ -#if defined (SVR4) || defined(_AIX) || defined(sco) +#if defined (SVR4) || defined(_AIX) /* needed for getaccess () call */ save_ruid = getuid(); -#if !defined(SVR4) && ! defined(sco) +#if !defined(SVR4) rv = setreuid(geteuid(),-1); #else rv = setuid(geteuid()); #endif save_rgid = getgid(); -#if !defined(SVR4) && !defined(sco) +#if !defined(SVR4) rv = setregid(getegid(),-1); #else rv = setgid(getegid()); #endif access_priv = access (path, R_OK); -#if !defined(SVR4) && !defined(sco) +#if !defined(SVR4) rv = setreuid(save_ruid,-1); rv = setregid(save_rgid,-1); #else diff --git a/cde/programs/dtfile/dtcopy/sharedFuncs.c b/cde/programs/dtfile/dtcopy/sharedFuncs.c index 27c60a3b..e34cbe17 100644 --- a/cde/programs/dtfile/dtcopy/sharedFuncs.c +++ b/cde/programs/dtfile/dtcopy/sharedFuncs.c @@ -44,20 +44,10 @@ **************************************************************************** ************************************<+>*************************************/ -#if defined(SVR4) || defined(sco) - -#if defined(USL) || defined(sco) -# include -# include -#endif -#ifdef sco -# include -# define ROOTINO S5ROOTINO -#else +#if defined(SVR4) # include # define ROOTINO UFSROOTINO -#endif /* ! sco */ -#endif /* SVR4 || sco */ +#endif /* SVR4 */ #if defined(DEC) # include diff --git a/cde/programs/dthello/Imakefile b/cde/programs/dthello/Imakefile index 8c3ade87..67a3dc65 100644 --- a/cde/programs/dthello/Imakefile +++ b/cde/programs/dthello/Imakefile @@ -12,14 +12,6 @@ EXTRA_DEFINES = -DHP_COLOR #if defined(SunArchitecture) SYS_LIBRARIES = -lm -ldl -lgen -#endif - -#if defined(USLArchitecture) -/* needed to turn off unresolved symbol detection for shlibs */ -#if HasSharedLibraries -EXTRA_LOAD_FLAGS = -z nodefs -#endif -SYS_LIBRARIES = -lm -ldl -lgen #endif SRCS1 = dthello.c version.c diff --git a/cde/programs/dthelp/dthelpdemo/Makefile.UXP b/cde/programs/dthelp/dthelpdemo/Makefile.UXP deleted file mode 100644 index 47664d15..00000000 --- a/cde/programs/dthelp/dthelpdemo/Makefile.UXP +++ /dev/null @@ -1,59 +0,0 @@ -# $XConsortium: Makefile.UXP /main/2 1996/05/13 11:31:31 drk $ -########################################################################## -# -# Makefile for dthelpdemo -# -# (Fujitsu.patch applied) -# -# (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 Unix System Labs, Inc., a subsidiary of -# Novell, Inc. -########################################################################## - -#ifndef CDE_INSTALLATION_TOP - CDE_INSTALLATION_TOP = /usr/dt -#endif - -PROGRAM = dthelpdemo -SOURCES = Main.c HelpCache.c HourGlass.c -OBJECTS = Main.o HelpCache.o HourGlass.o -HELPSRC = helpdemo.htg -HELPOUT = help/helpdemo.sdl \ - help/helpdemo.err \ - help/helpdemo.xrh - -OPTIMIZEDFLAGS = -O - -DTINCLUDE = -I$(CDE_INSTALLATION_TOP)/include -INCLUDES = $(DTINCLUDE) $(X11INCLUDE) -DTSVCLIB = -L$(CDE_INSTALLATION_TOP)/lib -lDtSvc -DTHELPLIB = -L$(CDE_INSTALLATION_TOP)/lib -lDtHelp - -TTLIB = -L$(CDE_INSTALLATION_TOP)/lib -ltt -XMLIB = -L$(CDE_INSTALLATION_TOP)/lib -lXm -XTLIB = -lXt -X11LIB = -lX11 -CPLUSPLUS = -L/usr/lib -lC -EXTRA_LIBS = -lgen -lm - -LIBRARIES = $(DTHELPLIB) $(DTSVCLIB) $(TTLIB) $(XMLIB) $(XTLIB) \ - $(X11LIB) $(CPLUSPLUS) $(EXTRA_LIBS) - -.c.o: - cc -c $(OPTIMIZEDFLAGS) $(INCLUDES) $< - -all:: $(PROGRAM) volume - -$(PROGRAM):: $(OBJECTS) - cc -o $(PROGRAM) $(LDFLAGS) $(OBJECTS) $(LIBRARIES) - -volume:: - (cd help/ ; \ - dthelptag $(HELPSRC);) - -clean:: - rm -f $(PROGRAM) - rm -f $(OBJECTS) - rm -f $(HELPOUT) diff --git a/cde/programs/dthelp/dthelpprint/Initialize.c b/cde/programs/dthelp/dthelpprint/Initialize.c index a846425b..447bf128 100644 --- a/cde/programs/dthelp/dthelpprint/Initialize.c +++ b/cde/programs/dthelp/dthelpprint/Initialize.c @@ -879,7 +879,7 @@ static float dphm = 300.*2540.; strcat(resource_class, RC_paperSize); /* e.g. Dthelpprint.Printer{.}.PaperSize */ -#if defined(_AIX) || defined (USL) +#if defined(_AIX) stricmp = strcmp; /* AIX and USL dont have strcasecmp */ #else stricmp = strcasecmp; diff --git a/cde/programs/dthelp/dthelpprint/PrintTopics.c b/cde/programs/dthelp/dthelpprint/PrintTopics.c index 0d212015..ef7cad9b 100644 --- a/cde/programs/dthelp/dthelpprint/PrintTopics.c +++ b/cde/programs/dthelp/dthelpprint/PrintTopics.c @@ -43,7 +43,7 @@ $COPYRIGHT$: #include #include #include /* for stat() */ -#if defined(sun) || defined(USL) +#if defined(sun) #include #else #include diff --git a/cde/programs/dthelp/parser.ccdf/htag/helptag/fproto.h b/cde/programs/dthelp/parser.ccdf/htag/helptag/fproto.h index fa7cfc52..eda78970 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/helptag/fproto.h +++ b/cde/programs/dthelp/parser.ccdf/htag/helptag/fproto.h @@ -706,7 +706,7 @@ void mb_strcode( #endif ) ; -#if defined(hpux) || defined(__aix) || defined(sun) || defined(USL) +#if defined(hpux) || defined(__aix) || defined(sun) char *strstr( #if defined(M_PROTO) const char *s1, const char *s2 diff --git a/cde/programs/dthelp/parser.ccdf/htag/helptag/global.h b/cde/programs/dthelp/parser.ccdf/htag/helptag/global.h index 9aea8e31..6f6ce4b5 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/helptag/global.h +++ b/cde/programs/dthelp/parser.ccdf/htag/helptag/global.h @@ -42,7 +42,7 @@ #endif #include -#if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) || defined(linux) || defined(CSRG_BASED) +#if defined(hpux) || defined(_AIX) || defined(sun) || defined(linux) || defined(CSRG_BASED) #include #include #endif @@ -168,9 +168,6 @@ EXTERN char driver[20] #if defined(sun) INIT("SUN") #endif -#if defined(USL) - INIT("USL") -#endif #endif ; @@ -197,7 +194,7 @@ EXTERN char dirsep #if defined(MSDOS) INIT('\\') #else -#if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) +#if defined(hpux) || defined(_AIX) || defined(sun) INIT('/') #else ****define directory separator here**** @@ -205,7 +202,7 @@ INIT('/') #endif ; -#if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) +#if defined(hpux) || defined(_AIX) || defined(sun) #define CSEP '/' #define SSEP "/" #else diff --git a/cde/programs/dthelp/parser.ccdf/htag/helptag/help.c b/cde/programs/dthelp/parser.ccdf/htag/helptag/help.c index 25a0fb0c..7a2f0e93 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/helptag/help.c +++ b/cde/programs/dthelp/parser.ccdf/htag/helptag/help.c @@ -151,7 +151,7 @@ void basename(M_NOPAR) *p = save; #else -#if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) || defined(linux) +#if defined(hpux) || defined(_AIX) || defined(sun) || defined(linux) #define CONTRIB "/usr/hphelp/bin/" /* get our path if we can */ @@ -996,7 +996,7 @@ int mb_getqualified ( qualname, unqualname ) char *qualname; char *unqualname; { -#if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) || defined(linux) +#if defined(hpux) || defined(_AIX) || defined(sun) || defined(linux) FILE *f; #endif char fn[FNAMELEN]; @@ -1020,7 +1020,7 @@ else fnp = fn; -#if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) || defined(linux) +#if defined(hpux) || defined(_AIX) || defined(sun) || defined(linux) qualname[0] = '\0'; gp = qualname + strlen(qualname); roomleft = roomleft - strlen(qualname); @@ -1134,7 +1134,7 @@ do { while (1); *strrchr(qualname, CSEP) = '\0'; -#if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) || defined(linux) +#if defined(hpux) || defined(_AIX) || defined(sun) || defined(linux) #else strupr ( qualname ); #endif @@ -2249,7 +2249,7 @@ while (name = m_cyclent(init, &type, &content, &wheredef)) #if defined(MSDOS) m_openchk(&nullfile, "NUL", "w"); #else -#if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) || defined(linux) +#if defined(hpux) || defined(_AIX) || defined(sun) || defined(linux) m_openchk(&nullfile, "/dev/null", "w"); #else m_openchk(&nullfile, "nullfile", "w"); diff --git a/cde/programs/dthelp/parser.ccdf/htag/helptag/help.if b/cde/programs/dthelp/parser.ccdf/htag/helptag/help.if index 275915e5..5e3ad6aa 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/helptag/help.if +++ b/cde/programs/dthelp/parser.ccdf/htag/helptag/help.if @@ -207,17 +207,6 @@ m_free(wc_1,"wide character string"); m_free(wc_2,"wide character string"); } -#else -#if defined(USL) - { - M_WCHAR *wc_1, *wc_2; - - wc_1 = MakeWideCharString("USL"); - wc_2 = MakeWideCharString("m-machine"); - m_piaction(wc_1, wc_2, M_SDATA) ; - m_free(wc_1,"wide character string"); - m_free(wc_2,"wide character string"); - } #else m_piaction("UNDEFINED MACHINE", "m-machine", @@ -225,7 +214,6 @@ #endif #endif #endif -#endif #endif <\CODE> diff --git a/cde/programs/dthelp/parser.ccdf/htag/helptag/make.c b/cde/programs/dthelp/parser.ccdf/htag/helptag/make.c index a9556ce6..8a4fb052 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/helptag/make.c +++ b/cde/programs/dthelp/parser.ccdf/htag/helptag/make.c @@ -36,14 +36,14 @@ #include #endif -#if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) +#if defined(hpux) || defined(_AIX) || defined(sun) #include #include #endif #include -#if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) +#if defined(hpux) || defined(_AIX) || defined(sun) #undef M_PI /* M_PI is used by markup, we don't need the math PI */ #endif diff --git a/cde/programs/dthelp/parser.ccdf/htag/helptag/option.c b/cde/programs/dthelp/parser.ccdf/htag/helptag/option.c index ebc6cc97..65e59d69 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/helptag/option.c +++ b/cde/programs/dthelp/parser.ccdf/htag/helptag/option.c @@ -26,7 +26,7 @@ #include "userinc.h" #include "globdec.h" -#if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) +#if defined(hpux) || defined(_AIX) || defined(sun) /* get definition of getenv(3c) for getting of environment variables */ #include #endif @@ -62,7 +62,7 @@ if (optfile = fopen(nameofoptfile, "r")) } m_free(nameofoptfile, "installation helptag.opt"); -#if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) +#if defined(hpux) || defined(_AIX) || defined(sun) { char *opts; diff --git a/cde/programs/dthelp/parser.ccdf/htag/parser/parser.c b/cde/programs/dthelp/parser.ccdf/htag/parser/parser.c index 1af30d52..09c7bde6 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/parser/parser.c +++ b/cde/programs/dthelp/parser.ccdf/htag/parser/parser.c @@ -51,7 +51,7 @@ void main(argc, argv) "prevcon=%d,token=%d,curcon=%d,scanval='%c'(%d),line=%d,netlevel=%d\n" ; static char name[] = "m_name = '%s'\n" ; static char literal[] = "m_literal = '%s'\n" ; -#if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) +#if defined(hpux) || defined(_AIX) || defined(sun) char buffer[M_LITLEN + 80] ; #else #define max4(a,b,c,d) (a>b&&a>c&&a>d) ? a : ((b>c&&b>d) ? b : (c>d ? c : d)) diff --git a/cde/programs/dthelp/parser.ccdf/htag/util/basic.h b/cde/programs/dthelp/parser.ccdf/htag/util/basic.h index 365ba315..bbb0d8c2 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/util/basic.h +++ b/cde/programs/dthelp/parser.ccdf/htag/util/basic.h @@ -46,7 +46,7 @@ typedef wchar_t M_WCHAR; /* For function prototypes */ typedef char * M_POINTER; -#if defined(hpux) || defined(__aix) || defined(sun) || defined(USL) +#if defined(hpux) || defined(__aix) || defined(sun) /* Old unix stuff *#define void int *#define M_NOPAR diff --git a/cde/programs/dthelp/parser.ccdf/htag/util/malloc.c b/cde/programs/dthelp/parser.ccdf/htag/util/malloc.c index 96456a1f..ab18230c 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/util/malloc.c +++ b/cde/programs/dthelp/parser.ccdf/htag/util/malloc.c @@ -94,7 +94,7 @@ void m_free(block, msg) if (m_heapchk) m_heapdump() ; #endif if (m_malftrace) { -#if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) +#if defined(hpux) || defined(_AIX) || defined(sun) sprintf(buffer, "%5x:%5x", (unsigned int) ((unsigned long) block >> 16), (unsigned int) block, msg) ; @@ -170,7 +170,7 @@ void *m_malloc(size, msg) m_exit(TRUE) ; } if (m_malftrace) { -#if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) +#if defined(hpux) || defined(_AIX) || defined(sun) sprintf(buffer, "%5x:%5x", (unsigned int) ((unsigned long) p >> 16), (unsigned int) p) ; #else @@ -211,7 +211,7 @@ void *m_realloc(ptr, size, msg) m_exit(TRUE) ; } if (m_malftrace) { -#if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) +#if defined(hpux) || defined(_AIX) || defined(sun) sprintf(buffer, "%5x:%5x", (unsigned int) ((unsigned long) p >> 16), (unsigned int) p) ; #else diff --git a/cde/programs/dthelp/parser/canon1/helptag/global.h b/cde/programs/dthelp/parser/canon1/helptag/global.h index b4dead17..0d615717 100644 --- a/cde/programs/dthelp/parser/canon1/helptag/global.h +++ b/cde/programs/dthelp/parser/canon1/helptag/global.h @@ -43,7 +43,7 @@ #endif #include -#if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) || defined(__osf__) || defined(linux) || defined(CSRG_BASED) +#if defined(hpux) || defined(_AIX) || defined(sun) || defined(__osf__) || defined(linux) || defined(CSRG_BASED) #include #include #include @@ -178,7 +178,7 @@ EXTERN char dirsep #if defined(MSDOS) INIT('\\') #else -#if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) || defined(__osf__) || defined(linux) || defined(CSRG_BASED) +#if defined(hpux) || defined(_AIX) || defined(sun) || defined(__osf__) || defined(linux) || defined(CSRG_BASED) INIT('/') #else ****define directory separator here**** @@ -186,7 +186,7 @@ INIT('/') #endif ; -#if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) || defined(__osf__) || defined(linux) || defined(CSRG_BASED) +#if defined(hpux) || defined(_AIX) || defined(sun) || defined(__osf__) || defined(linux) || defined(CSRG_BASED) #define CSEP '/' #define SSEP "/" #else diff --git a/cde/programs/dthelp/parser/canon1/helptag/help.c b/cde/programs/dthelp/parser/canon1/helptag/help.c index 209476a5..8a04624f 100644 --- a/cde/programs/dthelp/parser/canon1/helptag/help.c +++ b/cde/programs/dthelp/parser/canon1/helptag/help.c @@ -358,7 +358,7 @@ char *qualname; char *unqualname; #endif { -#if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) || defined(__osf__) || defined(linux) || defined(CSRG_BASED) +#if defined(hpux) || defined(_AIX) || defined(sun) || defined(__osf__) || defined(linux) || defined(CSRG_BASED) FILE *f; #endif @@ -383,7 +383,7 @@ else fnp = fn; -#if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) || defined(__osf__) || defined(linux) || defined(CSRG_BASED) +#if defined(hpux) || defined(_AIX) || defined(sun) || defined(__osf__) || defined(linux) || defined(CSRG_BASED) qualname[0] = '\0'; gp = qualname + strlen(qualname); roomleft = roomleft - strlen(qualname); @@ -497,7 +497,7 @@ do { while (1); *strrchr(qualname, CSEP) = '\0'; -#if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) || defined(__osf__) || defined(linux) || defined(CSRG_BASED) +#if defined(hpux) || defined(_AIX) || defined(sun) || defined(__osf__) || defined(linux) || defined(CSRG_BASED) #else strupr ( qualname ); #endif diff --git a/cde/programs/dthelp/parser/canon1/helptag/help.if b/cde/programs/dthelp/parser/canon1/helptag/help.if index 6c03acdc..eccd49ed 100644 --- a/cde/programs/dthelp/parser/canon1/helptag/help.if +++ b/cde/programs/dthelp/parser/canon1/helptag/help.if @@ -180,17 +180,6 @@ m_free(wc_2,"wide character string"); } #else -#if defined(USL) - { - M_WCHAR *wc_1, *wc_2; - - wc_1 = MakeWideCharString("USL"); - wc_2 = MakeWideCharString("m-machine"); - m_piaction(wc_1, wc_2, M_SDATA) ; - m_free(wc_1,"wide character string"); - m_free(wc_2,"wide character string"); - } -#else #if defined(__osf__) { M_WCHAR *wc_1, *wc_2; @@ -209,7 +198,6 @@ #endif #endif #endif -#endif #endif diff --git a/cde/programs/dthelp/parser/canon1/helptag/make.c b/cde/programs/dthelp/parser/canon1/helptag/make.c index a81fcbd8..c244acd8 100644 --- a/cde/programs/dthelp/parser/canon1/helptag/make.c +++ b/cde/programs/dthelp/parser/canon1/helptag/make.c @@ -36,14 +36,14 @@ #include #endif -#if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) || defined(__osf__) +#if defined(hpux) || defined(_AIX) || defined(sun) || defined(__osf__) #include #include #endif #include -#if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) || defined(__osf__) +#if defined(hpux) || defined(_AIX) || defined(sun) || defined(__osf__) #undef M_PI /* M_PI is used by markup, we don't need the math PI */ #endif diff --git a/cde/programs/dthelp/parser/canon1/helptag/option.c b/cde/programs/dthelp/parser/canon1/helptag/option.c index 95ed20f1..e3ca706b 100644 --- a/cde/programs/dthelp/parser/canon1/helptag/option.c +++ b/cde/programs/dthelp/parser/canon1/helptag/option.c @@ -26,7 +26,7 @@ #include "userinc.h" #include "globdec.h" -#if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) +#if defined(hpux) || defined(_AIX) || defined(sun) /* get definition of getenv(3c) for getting of environment variables */ #include #endif @@ -62,7 +62,7 @@ if (optfile = fopen(nameofoptfile, "r")) } m_free(nameofoptfile, "installation helptag.opt"); -#if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) +#if defined(hpux) || defined(_AIX) || defined(sun) { char *opts; diff --git a/cde/programs/dthelp/parser/canon1/parser/parser.c b/cde/programs/dthelp/parser/canon1/parser/parser.c index 71d1d1b2..0a6027ca 100644 --- a/cde/programs/dthelp/parser/canon1/parser/parser.c +++ b/cde/programs/dthelp/parser/canon1/parser/parser.c @@ -90,7 +90,7 @@ static char sopt[] = static char name[] = "m_name = '%s'\n" ; static char literal[] = "m_literal = '%s'\n" ; -#if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) || defined(__osf__) || defined(linux) +#if defined(hpux) || defined(_AIX) || defined(sun) || defined(__osf__) || defined(linux) char buffer[M_LITLEN + 80] ; #else #define max4(a,b,c,d) (a>b&&a>c&&a>d) ? a : ((b>c&&b>d) ? b : (c>d ? c : d)) diff --git a/cde/programs/dthelp/parser/canon1/util/basic.h b/cde/programs/dthelp/parser/canon1/util/basic.h index 07168e55..30706b1c 100644 --- a/cde/programs/dthelp/parser/canon1/util/basic.h +++ b/cde/programs/dthelp/parser/canon1/util/basic.h @@ -46,7 +46,7 @@ typedef wchar_t M_WCHAR; /* For function prototypes */ typedef char * M_POINTER; -#if defined(hpux) || defined(__aix) || defined(sun) || defined(USL) +#if defined(hpux) || defined(__aix) || defined(sun) /* Old unix stuff *#define void int *#define M_NOPAR diff --git a/cde/programs/dthelp/parser/canon1/util/malloc.c b/cde/programs/dthelp/parser/canon1/util/malloc.c index f0ae8f52..33f28487 100644 --- a/cde/programs/dthelp/parser/canon1/util/malloc.c +++ b/cde/programs/dthelp/parser/canon1/util/malloc.c @@ -95,7 +95,7 @@ void m_free(block, msg) #endif free(block) ; if (m_malftrace) { -#if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) +#if defined(hpux) || defined(_AIX) || defined(sun) snprintf(buffer, 32, "%5x:%5x", (unsigned int) ((unsigned long) block >> 16), (unsigned int) block) ; @@ -170,7 +170,7 @@ void *m_malloc(size, msg) m_exit(TRUE) ; } if (m_malftrace) { -#if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) +#if defined(hpux) || defined(_AIX) || defined(sun) snprintf(buffer, 32, "%5x:%5x", (unsigned int) ((unsigned long) p >> 16), (unsigned int) p) ; #else @@ -211,7 +211,7 @@ void *m_realloc(ptr, size, msg) m_exit(TRUE) ; } if (m_malftrace) { -#if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) +#if defined(hpux) || defined(_AIX) || defined(sun) snprintf(buffer, 32, "%5x:%5x", (unsigned int) ((unsigned long) p >> 16), (unsigned int) p) ; #else diff --git a/cde/programs/dthelp/parser/pass1/helptag/help.c b/cde/programs/dthelp/parser/pass1/helptag/help.c index 381f8bde..81e57ff7 100644 --- a/cde/programs/dthelp/parser/pass1/helptag/help.c +++ b/cde/programs/dthelp/parser/pass1/helptag/help.c @@ -357,7 +357,7 @@ char *qualname; char *unqualname; #endif { -#if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) || defined(__osf__) || defined(linux) || defined(CSRG_BASED) +#if defined(hpux) || defined(_AIX) || defined(sun) || defined(__osf__) || defined(linux) || defined(CSRG_BASED) FILE *f; #endif char fn[FNAMELEN]; @@ -381,7 +381,7 @@ else fnp = fn; -#if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) || defined(__osf__) || defined(linux) || defined(CSRG_BASED) +#if defined(hpux) || defined(_AIX) || defined(sun) || defined(__osf__) || defined(linux) || defined(CSRG_BASED) qualname[0] = '\0'; gp = qualname + strlen(qualname); roomleft = roomleft - strlen(qualname); @@ -495,7 +495,7 @@ do { while (1); *strrchr(qualname, CSEP) = '\0'; -#if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) || defined(__osf__) || defined(linux) || defined(CSRG_BASED) +#if defined(hpux) || defined(_AIX) || defined(sun) || defined(__osf__) || defined(linux) || defined(CSRG_BASED) #else strupr ( qualname ); #endif diff --git a/cde/programs/dthelp/parser/pass1/helptag/help.if b/cde/programs/dthelp/parser/pass1/helptag/help.if index 32010dac..e8d45927 100644 --- a/cde/programs/dthelp/parser/pass1/helptag/help.if +++ b/cde/programs/dthelp/parser/pass1/helptag/help.if @@ -169,17 +169,6 @@ m_free(wc_2,"wide character string"); } #else -#if defined(USL) - { - M_WCHAR *wc_1, *wc_2; - - wc_1 = MakeWideCharString("USL"); - wc_2 = MakeWideCharString("m-machine"); - m_piaction(wc_1, wc_2, M_SDATA) ; - m_free(wc_1,"wide character string"); - m_free(wc_2,"wide character string"); - } -#else #if defined(__osf__) { M_WCHAR *wc_1, *wc_2; @@ -198,7 +187,6 @@ #endif #endif #endif -#endif #endif <\CODE> diff --git a/cde/programs/dthelp/parser/pass1/helptag/make.c b/cde/programs/dthelp/parser/pass1/helptag/make.c index 7742e525..3cb88bb6 100644 --- a/cde/programs/dthelp/parser/pass1/helptag/make.c +++ b/cde/programs/dthelp/parser/pass1/helptag/make.c @@ -36,14 +36,14 @@ #include #endif -#if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) || defined(__osf__) +#if defined(hpux) || defined(_AIX) || defined(sun) || defined(__osf__) #include #include #endif #include -#if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL)|| defined(__osf__) +#if defined(hpux) || defined(_AIX) || defined(sun) || defined(__osf__) #undef M_PI /* M_PI is used by markup, we don't need the math PI */ #endif diff --git a/cde/programs/dthelp/parser/pass1/helptag/option.c b/cde/programs/dthelp/parser/pass1/helptag/option.c index 71017d9c..a10226b7 100644 --- a/cde/programs/dthelp/parser/pass1/helptag/option.c +++ b/cde/programs/dthelp/parser/pass1/helptag/option.c @@ -26,7 +26,7 @@ #include "userinc.h" #include "globdec.h" -#if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) +#if defined(hpux) || defined(_AIX) || defined(sun) /* get definition of getenv(3c) for getting of environment variables */ #include #endif @@ -62,7 +62,7 @@ if (optfile = fopen(nameofoptfile, "r")) } m_free(nameofoptfile, "installation helptag.opt"); -#if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) +#if defined(hpux) || defined(_AIX) || defined(sun) { char *opts; diff --git a/cde/programs/dthelp/parser/pass1/parser/parser.c b/cde/programs/dthelp/parser/pass1/parser/parser.c index 1261694d..1be0f2b1 100644 --- a/cde/programs/dthelp/parser/pass1/parser/parser.c +++ b/cde/programs/dthelp/parser/pass1/parser/parser.c @@ -45,7 +45,7 @@ int main(argc, argv) "prevcon=%d,token=%d,curcon=%d,scanval='%c'(%d),line=%d,netlevel=%d\n" ; static char name[] = "m_name = '%s'\n" ; static char literal[] = "m_literal = '%s'\n" ; -#if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) || defined(__osf__) || defined(linux) +#if defined(hpux) || defined(_AIX) || defined(sun) || defined(__osf__) || defined(linux) char buffer[M_LITLEN + 80] ; #else #define max4(a,b,c,d) (a>b&&a>c&&a>d) ? a : ((b>c&&b>d) ? b : (c>d ? c : d)) diff --git a/cde/programs/dthelp/parser/pass1/util/basic.h b/cde/programs/dthelp/parser/pass1/util/basic.h index e28bd5c3..88cc5c60 100644 --- a/cde/programs/dthelp/parser/pass1/util/basic.h +++ b/cde/programs/dthelp/parser/pass1/util/basic.h @@ -46,7 +46,7 @@ typedef wchar_t M_WCHAR; /* For function prototypes */ typedef char * M_POINTER; -#if defined(hpux) || defined(__aix) || defined(sun) || defined(USL) +#if defined(hpux) || defined(__aix) || defined(sun) /* Old unix stuff *#define void int *#define M_NOPAR diff --git a/cde/programs/dthelp/parser/pass1/util/malloc.c b/cde/programs/dthelp/parser/pass1/util/malloc.c index 410a280c..ffcdb1c6 100644 --- a/cde/programs/dthelp/parser/pass1/util/malloc.c +++ b/cde/programs/dthelp/parser/pass1/util/malloc.c @@ -94,7 +94,7 @@ void m_free(block, msg) if (m_heapchk) m_heapdump() ; #endif if (m_malftrace) { -#if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) +#if defined(hpux) || defined(_AIX) || defined(sun) snprintf(buffer, 32, "%5x:%5x", (unsigned int) ((unsigned long) block >> 16), (unsigned int) block) ; @@ -170,7 +170,7 @@ void *m_malloc(size, msg) m_exit(TRUE) ; } if (m_malftrace) { -#if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) +#if defined(hpux) || defined(_AIX) || defined(sun) snprintf(buffer, 32, "%5x:%5x", (unsigned int) ((unsigned long) p >> 16), (unsigned int) p) ; #else @@ -211,7 +211,7 @@ void *m_realloc(ptr, size, msg) m_exit(TRUE) ; } if (m_malftrace) { -#if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) +#if defined(hpux) || defined(_AIX) || defined(sun) snprintf(buffer, 32, "%5x:%5x", (unsigned int) ((unsigned long) p >> 16), (unsigned int) p) ; #else diff --git a/cde/programs/dthelp/parser/pass2/htag2/global.h b/cde/programs/dthelp/parser/pass2/htag2/global.h index 01d0a3ea..b1bf2ea6 100644 --- a/cde/programs/dthelp/parser/pass2/htag2/global.h +++ b/cde/programs/dthelp/parser/pass2/htag2/global.h @@ -43,7 +43,7 @@ #endif #include -#if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) || defined(linux) || defined(CSRG_BASED) +#if defined(hpux) || defined(_AIX) || defined(sun) || defined(linux) || defined(CSRG_BASED) #include #include #include diff --git a/cde/programs/dthelp/parser/pass2/htag2/option.c b/cde/programs/dthelp/parser/pass2/htag2/option.c index 714223a4..0aeca13b 100644 --- a/cde/programs/dthelp/parser/pass2/htag2/option.c +++ b/cde/programs/dthelp/parser/pass2/htag2/option.c @@ -26,7 +26,7 @@ #include "userinc.h" #include "globdec.h" -#if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) +#if defined(hpux) || defined(_AIX) || defined(sun) /* get definition of getenv(3c) for getting of environment variables */ #include #endif @@ -62,7 +62,7 @@ if (optfile = fopen(nameofoptfile, "r")) } m_free(nameofoptfile, "installation helptag.opt"); -#if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) || defined(__osf__) +#if defined(hpux) || defined(_AIX) || defined(sun) || defined(__osf__) { char *opts; diff --git a/cde/programs/dthelp/parser/pass2/parser/parser.c b/cde/programs/dthelp/parser/pass2/parser/parser.c index 289c309c..b29eee28 100644 --- a/cde/programs/dthelp/parser/pass2/parser/parser.c +++ b/cde/programs/dthelp/parser/pass2/parser/parser.c @@ -45,7 +45,7 @@ void main(argc, argv) "prevcon=%d,token=%d,curcon=%d,scanval='%c'(%d),line=%d,netlevel=%d\n" ; static char name[] = "m_name = '%s'\n" ; static char literal[] = "m_literal = '%s'\n" ; -#if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) || defined(__osf__) +#if defined(hpux) || defined(_AIX) || defined(sun) || defined(__osf__) char buffer[M_LITLEN + 80] ; #else #define max4(a,b,c,d) (a>b&&a>c&&a>d) ? a : ((b>c&&b>d) ? b : (c>d ? c : d)) diff --git a/cde/programs/dthelp/parser/pass2/util/basic.h b/cde/programs/dthelp/parser/pass2/util/basic.h index 9d54bcaf..d77c6528 100644 --- a/cde/programs/dthelp/parser/pass2/util/basic.h +++ b/cde/programs/dthelp/parser/pass2/util/basic.h @@ -46,7 +46,7 @@ typedef wchar_t M_WCHAR; /* For function prototypes */ typedef char * M_POINTER; -#if defined(hpux) || defined(__aix) || defined(sun) || defined(USL) +#if defined(hpux) || defined(__aix) || defined(sun) /* Old unix stuff *#define void int *#define M_NOPAR diff --git a/cde/programs/dthelp/parser/pass2/util/malloc.c b/cde/programs/dthelp/parser/pass2/util/malloc.c index 40162f72..11e7bf5c 100644 --- a/cde/programs/dthelp/parser/pass2/util/malloc.c +++ b/cde/programs/dthelp/parser/pass2/util/malloc.c @@ -92,7 +92,7 @@ void m_free(void *block, char *msg) if (m_heapchk) m_heapdump() ; #endif if (m_malftrace) { -#if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) +#if defined(hpux) || defined(_AIX) || defined(sun) snprintf(buffer, 32, "%5x:%5x", (unsigned int) ((unsigned long) block >> 16), (unsigned int) block) ; @@ -168,7 +168,7 @@ void *m_malloc(size, msg) m_exit(TRUE) ; } if (m_malftrace) { -#if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) +#if defined(hpux) || defined(_AIX) || defined(sun) snprintf(buffer, 32, "%5x:%5x", (unsigned int) ((unsigned long) p >> 16), (unsigned int) p) ; #else @@ -209,7 +209,7 @@ void *m_realloc(ptr, size, msg) m_exit(TRUE) ; } if (m_malftrace) { -#if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) +#if defined(hpux) || defined(_AIX) || defined(sun) snprintf(buffer, 32, "%5x:%5x", (unsigned int) ((unsigned long) p >> 16), (unsigned int) p) ; #else diff --git a/cde/programs/dticon/Imakefile b/cde/programs/dticon/Imakefile index 5f16b5c5..6cbe04a3 100644 --- a/cde/programs/dticon/Imakefile +++ b/cde/programs/dticon/Imakefile @@ -42,10 +42,6 @@ SYS_LIBRARIES = -lm -liconv SYS_LIBRARIES = -lm -ldl #endif /* SunArchitecture */ -#if defined (USLArchitecture) -SYS_LIBRARIES = -lm -ldl -lgen -#endif /* USLArchitecture */ - #if defined (AlphaArchitecture) EXTRA_DEFINES = #endif diff --git a/cde/programs/dtimsstart/start.c b/cde/programs/dtimsstart/start.c index fa268bfe..ae63f022 100644 --- a/cde/programs/dtimsstart/start.c +++ b/cde/programs/dtimsstart/start.c @@ -28,7 +28,7 @@ #include #include -#if (defined(USL) || defined(linux) || defined(CSRG_BASED)) && !defined(_NFILE) +#if (defined(linux) || defined(CSRG_BASED)) && !defined(_NFILE) #define _NFILE FOPEN_MAX #endif diff --git a/cde/programs/dtinfo/DtMmdb/HardCopy/TemplatesAutoNumber.C b/cde/programs/dtinfo/DtMmdb/HardCopy/TemplatesAutoNumber.C index a1934411..efd6f5a5 100644 --- a/cde/programs/dtinfo/DtMmdb/HardCopy/TemplatesAutoNumber.C +++ b/cde/programs/dtinfo/DtMmdb/HardCopy/TemplatesAutoNumber.C @@ -35,7 +35,7 @@ #endif /* end of CDE_NEXT */ -#if defined(sun) || defined(hpux) || defined(USL) +#if defined(sun) || defined(hpux) #ifndef CDE_NEXT /* { */ @@ -118,31 +118,3 @@ CC_Boolean kv_pair::f_needRemove = FALSE; CC_Boolean kv_pair::f_needRemove = FALSE; #endif - -#ifdef USL - -#pragma instantiate hashTable -#pragma instantiate hashTable - -#ifndef CDE_NEXT -#pragma instantiate CC_TPtrSlistDictionary -#pragma instantiate CC_TPtrSlistDictionary -#endif - -#pragma instantiate CC_TPtrSlist - -#pragma instantiate hashTableIterator -#pragma instantiate hashTableIterator - -#pragma instantiate Stack - -// still unresolved - -#pragma instantiate CC_TPtrSlist > -#pragma instantiate kv_pair -#pragma instantiate kv_pair -#pragma instantiate CC_TPtrSlist > -#pragma instantiate pointer_vector > > -#pragma instantiate pointer_vector > > - -#endif diff --git a/cde/programs/dtinfo/DtMmdb/StyleSheet/DocParser.C b/cde/programs/dtinfo/DtMmdb/StyleSheet/DocParser.C index 6a6cb0d4..c77c75c2 100644 --- a/cde/programs/dtinfo/DtMmdb/StyleSheet/DocParser.C +++ b/cde/programs/dtinfo/DtMmdb/StyleSheet/DocParser.C @@ -245,7 +245,6 @@ DocParser::process(istream &input, ostringstream &output, #if !defined(SC3) && \ !defined(__osf__) && \ !defined(_IBMR2) && \ - !defined(USL) && \ !defined(linux) && \ !defined(CSRG_BASED) && \ !defined(sun) @@ -255,7 +254,6 @@ DocParser::process(istream &input, ostringstream &output, #if !defined(SC3) && \ !defined(__osf__) && \ !defined(_IBMR2) && \ - !defined(USL) && \ !defined(linux) && \ !defined(CSRG_BASED) && \ !defined(sun) diff --git a/cde/programs/dtinfo/DtMmdb/StyleSheet/Expression.C b/cde/programs/dtinfo/DtMmdb/StyleSheet/Expression.C index 5a7b0efd..e0fb9b64 100644 --- a/cde/programs/dtinfo/DtMmdb/StyleSheet/Expression.C +++ b/cde/programs/dtinfo/DtMmdb/StyleSheet/Expression.C @@ -142,19 +142,19 @@ BinaryOperatorNode::evaluate() const // calculate children trees and then have feature value do the operation #if !defined(SC3) && !defined(_IBMR2) && \ - !defined(__osf__) && !defined(USL) && !defined(linux) && \ + !defined(__osf__) && !defined(linux) && \ !defined(CSRG_BASED) && !defined(sun) volatile #endif FeatureValue *left = 0; #if !defined(SC3) && !defined(_IBMR2) && \ - !defined(__osf__) && !defined(USL) && !defined(linux) && \ + !defined(__osf__) && !defined(linux) && \ !defined(CSRG_BASED) && !defined(sun) volatile #endif FeatureValue *right = 0; #if !defined(SC3) && !defined(_IBMR2) && \ - !defined(__osf__) && !defined(USL) && !defined(linux) && \ + !defined(__osf__) && !defined(linux) && \ !defined(CSRG_BASED) && !defined(sun) volatile #endif diff --git a/cde/programs/dtinfo/DtMmdb/StyleSheet/SSTemplates.C b/cde/programs/dtinfo/DtMmdb/StyleSheet/SSTemplates.C index b70b1e84..df2260a8 100644 --- a/cde/programs/dtinfo/DtMmdb/StyleSheet/SSTemplates.C +++ b/cde/programs/dtinfo/DtMmdb/StyleSheet/SSTemplates.C @@ -69,7 +69,7 @@ typedef Stack > _stack_fs_orvec_fs_; // the largest ID used in f's: 59 // -#if defined(sun) || defined(hpux) || defined (USL) +#if defined(sun) || defined(hpux) typedef CC_TPtrSlist _f4_; typedef CC_TPtrSlist _f5_; typedef CC_TPtrSlist _f2_; @@ -232,76 +232,3 @@ typedef pointer_vector _pointer_vector_FeatureValue_; #pragma define_template kv_pair #pragma define_template CC_TPtrSlist #endif - -#ifdef USL - -#pragma instantiate CC_TPtrSlist -#pragma instantiate CC_TPtrDlist - -#pragma instantiate CC_TPtrSlist -#pragma instantiate CC_TPtrSlist -#pragma instantiate CC_TPtrSlist -#pragma instantiate CC_TPtrSlist -#pragma instantiate CC_TPtrSlist -#pragma instantiate CC_TPtrSlist -#pragma instantiate CC_TPtrSlist - -#pragma instantiate CC_TPtrDlist -#pragma instantiate CC_TPtrDlist -#pragma instantiate CC_TPtrDlist -#pragma instantiate CC_TPtrDlist - -#pragma instantiate hashTable -#pragma instantiate hashTable -#pragma instantiate hashTable - -#pragma instantiate hashTableIterator -#pragma instantiate hashTableIterator -#pragma instantiate hashTableIterator -#pragma instantiate hashTableIterator - - -#ifndef CDE_NEXT -#pragma instantiate CC_TPtrSlistDictionary -#pragma instantiate CC_TPtrSlistDictionary -#pragma instantiate CC_TPtrSlistDictionary -#pragma instantiate CC_TPtrSlistDictionary -#endif - -typedef dlist_array _ordvec_cstring_ ; -typedef CC_TValSlist _f54_; -typedef value_vector _PathTermPtrvalue_vector_; -typedef pointer_vector _pointer_vector_FeatureValue_; - -#pragma instantiate dlist_array -#pragma instantiate CC_TValSlist -#pragma instantiate value_vector -#pragma instantiate pointer_vector - -// unresolved references - -#pragma instantiate CC_TPtrDlist -#pragma instantiate CC_TPtrDlistIterator -#pragma instantiate CC_TValSlistIterator -#pragma instantiate CC_TPtrSlist -#pragma instantiate dlist_array -#pragma instantiate CC_TPtrSlist -#pragma instantiate kv_pair -#pragma instantiate CC_TPtrSlist > -#pragma instantiate pointer_vector > > -#pragma instantiate CC_TPtrSlist > -#pragma instantiate pointer_vector > > -#pragma instantiate CC_TPtrSlist -#pragma instantiate kv_pair -#pragma instantiate CC_TPtrSlist > -#pragma instantiate pointer_vector > > -#pragma instantiate CC_TPtrSlist > -#pragma instantiate pointer_vector > > -#pragma instantiate CC_TValSlist -#pragma instantiate CC_TValSlistIterator -#pragma instantiate CC_TValSlistIterator - -#pragma instantiate kv_pair -#pragma instantiate kv_pair -#pragma instantiate CC_TPtrSlist -#endif diff --git a/cde/programs/dtinfo/DtMmdb/StyleSheet/defToken.C b/cde/programs/dtinfo/DtMmdb/StyleSheet/defToken.C index 412a49b6..cd53519c 100644 --- a/cde/programs/dtinfo/DtMmdb/StyleSheet/defToken.C +++ b/cde/programs/dtinfo/DtMmdb/StyleSheet/defToken.C @@ -43,7 +43,7 @@ #include -#if !defined(__osf__) && !defined(USL) && !defined(linux) && \ +#if !defined(__osf__) && !defined(linux) && \ !defined(CSRG_BASED) && !defined(sun) #include #endif diff --git a/cde/programs/dtinfo/DtMmdb/StyleSheet/tokenStyle.C b/cde/programs/dtinfo/DtMmdb/StyleSheet/tokenStyle.C index c48b7259..5144c0d6 100644 --- a/cde/programs/dtinfo/DtMmdb/StyleSheet/tokenStyle.C +++ b/cde/programs/dtinfo/DtMmdb/StyleSheet/tokenStyle.C @@ -43,7 +43,7 @@ #include -#if !defined(__osf__) && !defined(USL) && !defined(linux) && \ +#if !defined(__osf__) && !defined(linux) && \ !defined(CSRG_BASED) && !defined(sun) #include #endif diff --git a/cde/programs/dtinfo/DtMmdb/compression/ps.C b/cde/programs/dtinfo/DtMmdb/compression/ps.C index 0c80c3e0..a13ebb4a 100644 --- a/cde/programs/dtinfo/DtMmdb/compression/ps.C +++ b/cde/programs/dtinfo/DtMmdb/compression/ps.C @@ -46,10 +46,8 @@ #if defined(__osf__) || defined(linux) || defined(CSRG_BASED) || defined(sun) #include #else -#if !defined(USL) #include #endif -#endif /* use prototypes in function declarations */ #define ps_USE_PROTOS diff --git a/cde/programs/dtinfo/DtMmdb/compression/sgml.C b/cde/programs/dtinfo/DtMmdb/compression/sgml.C index 053f5532..4a0381a1 100644 --- a/cde/programs/dtinfo/DtMmdb/compression/sgml.C +++ b/cde/programs/dtinfo/DtMmdb/compression/sgml.C @@ -46,10 +46,8 @@ #if defined(__osf__) || defined(linux) || defined(CSRG_BASED) || defined(sun) #include #else -#if !defined(USL) #include #endif -#endif /* use prototypes in function declarations */ #define sgml_USE_PROTOS diff --git a/cde/programs/dtinfo/DtMmdb/dti_excs/Exception.hh b/cde/programs/dtinfo/DtMmdb/dti_excs/Exception.hh index 9378d498..9e7fbd5f 100644 --- a/cde/programs/dtinfo/DtMmdb/dti_excs/Exception.hh +++ b/cde/programs/dtinfo/DtMmdb/dti_excs/Exception.hh @@ -82,10 +82,8 @@ public: // Need to provide a plain operator new definition because we // have a definition of the other one below. (See the ARM.) -#ifndef USL static void *operator new (size_t size) { return (::operator new (size)); } -#endif static void operator delete (void *place); diff --git a/cde/programs/dtinfo/DtMmdb/dti_excs/Exceptions.hh b/cde/programs/dtinfo/DtMmdb/dti_excs/Exceptions.hh index 0e91aa41..ca7850b3 100644 --- a/cde/programs/dtinfo/DtMmdb/dti_excs/Exceptions.hh +++ b/cde/programs/dtinfo/DtMmdb/dti_excs/Exceptions.hh @@ -130,7 +130,7 @@ extern "C" { // This works if OBJ is an object or a pointer since Exception objects // overload operator ->. -#if !defined(hpux) && !defined(USL) +#if !defined(hpux) #define mthrow(OBJ) \ (OBJ)->throw_it (__LINE__, __FILE__, DEBUG_THROW_FLAG) #else diff --git a/cde/programs/dtinfo/DtMmdb/schema/token.C b/cde/programs/dtinfo/DtMmdb/schema/token.C index dc5b4f85..9874030d 100644 --- a/cde/programs/dtinfo/DtMmdb/schema/token.C +++ b/cde/programs/dtinfo/DtMmdb/schema/token.C @@ -46,10 +46,8 @@ #if defined(__osf__) || defined(linux) || defined(CSRG_BASED) || defined(sun) #include #else -#if !defined(USL) #include #endif -#endif /* use prototypes in function declarations */ #define schema_USE_PROTOS diff --git a/cde/programs/dtinfo/DtMmdb/utility/filebuf.C b/cde/programs/dtinfo/DtMmdb/utility/filebuf.C index 90a1e089..4e092213 100644 --- a/cde/programs/dtinfo/DtMmdb/utility/filebuf.C +++ b/cde/programs/dtinfo/DtMmdb/utility/filebuf.C @@ -26,7 +26,7 @@ #include #include -#if !defined(hpux) && !defined(__osf__) && !defined(USL) && \ +#if !defined(hpux) && !defined(__osf__) && \ !defined(linux) && !defined(CSRG_BASED) && !defined(sun) #include #endif diff --git a/cde/programs/dtinfo/DtMmdb/utility/funcs.C b/cde/programs/dtinfo/DtMmdb/utility/funcs.C index b487ad19..8b942001 100644 --- a/cde/programs/dtinfo/DtMmdb/utility/funcs.C +++ b/cde/programs/dtinfo/DtMmdb/utility/funcs.C @@ -82,45 +82,6 @@ int getdomainname(char *, int); #define BUFLEN 512 -#ifdef USL - -int _DtMmdbStrcasecmp(register const char* s1, register const char* s2) -{ - register int c1, c2; - - while (*s1 && *s2) { - c1 = isupper(*s1) ? tolower(*s1) : *s1; - c2 = isupper(*s2) ? tolower(*s2) : *s2; - if (c1 != c2) - return (c1 - c2); - s1++; - s2++; - } - return (int) (*s1 - *s2); -} - -int _DtMmdbStrncasecmp(register const char* s1, - register const char* s2, - register int count) -{ - register int c1, c2; - - if (!count) - return 0; - - while (*s1 && *s2) { - c1 = isupper(*s1) ? tolower(*s1) : *s1; - c2 = isupper(*s2) ? tolower(*s2) : *s2; - if ((c1 != c2) || (! --count)) - return (c1 - c2); - s1++; - s2++; - } - return (int) (*s1 - *s2); -} - -#endif - #ifdef mips #include diff --git a/cde/programs/dtinfo/DtMmdb/utility/funcs.h b/cde/programs/dtinfo/DtMmdb/utility/funcs.h index 89261a22..9137f5e5 100644 --- a/cde/programs/dtinfo/DtMmdb/utility/funcs.h +++ b/cde/programs/dtinfo/DtMmdb/utility/funcs.h @@ -52,11 +52,11 @@ #ifndef _funcs_h #define _funcs_h 1 -#if !defined(USL) && !defined(__osf__) && !defined(linux) && \ +#if !defined(__osf__) && !defined(linux) && \ !defined(CSRG_BASED) && !defined(sun) #include #endif -#if defined(hpux) || defined(sgi) || defined(USL) ||defined(__osf__) || \ +#if defined(hpux) || defined(sgi) ||defined(__osf__) || \ defined(linux) || defined(CSRG_BASED) || defined(sun) #include #else @@ -95,12 +95,6 @@ using namespace std; #include "utility/macro.h" #include "utility/mmdb_exception.h" -#ifdef USL -int _DtMmdbStrcasecmp(const char *s1, const char *s2); -int _DtMmdbStrncasecmp(const char *s1, const char *s2, int n); -#define strcasecmp(s1,s2) _DtMmdbStrcasecmp(s1,s2) -#define strncasecmp(s1,s2,n) _DtMmdbStrncasecmp(s1,s2,n) -#endif #ifdef _IBMR2 /* no C++ version of , C version causes conflicts */ extern "C" { diff --git a/cde/programs/dtinfo/DtMmdb/utility/streambuf.C b/cde/programs/dtinfo/DtMmdb/utility/streambuf.C index 2f488efc..2d9854bb 100644 --- a/cde/programs/dtinfo/DtMmdb/utility/streambuf.C +++ b/cde/programs/dtinfo/DtMmdb/utility/streambuf.C @@ -23,7 +23,7 @@ /* $XConsortium: streambuf.C /main/8 1996/08/21 15:55:14 drk $ */ #include "utility/c_streambuf.h" -#if defined(USL) || defined(__osf__) || defined(linux) || \ +#if defined(__osf__) || defined(linux) || \ defined(CSRG_BASED) || defined(sun) #include #else diff --git a/cde/programs/dtinfo/DtMmdb/utility/xtime.C b/cde/programs/dtinfo/DtMmdb/utility/xtime.C index 8222b839..7ccaef93 100644 --- a/cde/programs/dtinfo/DtMmdb/utility/xtime.C +++ b/cde/programs/dtinfo/DtMmdb/utility/xtime.C @@ -48,7 +48,7 @@ #ifdef SVR4 #include -#if !defined (_IBMR2) && !defined(sun) && !defined(USL) +#if !defined (_IBMR2) && !defined(sun) extern "C" { extern int gettimeofday(struct timeval *tp); } #endif @@ -78,7 +78,7 @@ void xtime::stop(float &cpu_time, long &elp_time) void xtime::start() { -#if defined (SVR4) && !defined (_IBMR2) && !defined(sun) && !defined(__osf__) && !defined(USL) +#if defined (SVR4) && !defined (_IBMR2) && !defined(sun) && !defined(__osf__) if ( gettimeofday(&v_tv) != 0 ) { #else if ( gettimeofday(&v_tv, &v_tz) != 0 ) { diff --git a/cde/programs/dtinfo/dtinfo/src/Agents/BookmarkEditMotif.C b/cde/programs/dtinfo/dtinfo/src/Agents/BookmarkEditMotif.C index f386bc63..56427ed1 100644 --- a/cde/programs/dtinfo/dtinfo/src/Agents/BookmarkEditMotif.C +++ b/cde/programs/dtinfo/dtinfo/src/Agents/BookmarkEditMotif.C @@ -93,10 +93,8 @@ using namespace std; int BookmarkEdit::g_modified_count = 0; #ifdef SVR4 -#ifndef USL #include #endif -#endif #define THIS_CLASS BookmarkEdit #define ON_ACTIVATE(WOBJ,FUNC) \ diff --git a/cde/programs/dtinfo/dtinfo/src/Agents/PrefAgentMotif.C b/cde/programs/dtinfo/dtinfo/src/Agents/PrefAgentMotif.C index 7c4c83a1..023b4160 100644 --- a/cde/programs/dtinfo/dtinfo/src/Agents/PrefAgentMotif.C +++ b/cde/programs/dtinfo/dtinfo/src/Agents/PrefAgentMotif.C @@ -88,10 +88,8 @@ #include #ifdef SVR4 -#ifndef USL #include // 1/21/94 yuji #endif -#endif /* Update time in milliseconds when arrow button held down. */ #define CHANGE_SPEED 300 diff --git a/cde/programs/dtinfo/dtinfo/src/Agents/SearchResultsAgentMotif.C b/cde/programs/dtinfo/dtinfo/src/Agents/SearchResultsAgentMotif.C index f5d3e448..e3cf9ac4 100644 --- a/cde/programs/dtinfo/dtinfo/src/Agents/SearchResultsAgentMotif.C +++ b/cde/programs/dtinfo/dtinfo/src/Agents/SearchResultsAgentMotif.C @@ -88,10 +88,8 @@ using namespace std; #include #ifdef SVR4 -#ifndef USL #include #endif -#endif static Boolean g_allow_query_text_change; diff --git a/cde/programs/dtinfo/dtinfo/src/Agents/SearchScopeAgentMotif.C b/cde/programs/dtinfo/dtinfo/src/Agents/SearchScopeAgentMotif.C index 67d08b3b..0cfd7596 100644 --- a/cde/programs/dtinfo/dtinfo/src/Agents/SearchScopeAgentMotif.C +++ b/cde/programs/dtinfo/dtinfo/src/Agents/SearchScopeAgentMotif.C @@ -99,10 +99,8 @@ #include #ifdef SVR4 -#ifndef USL #include // 1/19/94 yuji #endif -#endif #include #include @@ -123,26 +121,6 @@ extern "C" #endif -#ifdef USL - -strcasecmp(register const char *s1, - register const char *s2) -{ - register int c1, c2; - - while (*s1 && *s2) { - c1 = isupper(*s1) ? tolower(*s1) : *s1; - c2 = isupper(*s2) ? tolower(*s2) : *s2; - if (c1 != c2) - return (c1 - c2); - s1++; - s2++; - } - return (int) (*s1 - *s2); -} - -#endif - #define CLASS SearchScopeAgent #include "create_macros.hh" diff --git a/cde/programs/dtinfo/dtinfo/src/Agents/SearchScopeList.C b/cde/programs/dtinfo/dtinfo/src/Agents/SearchScopeList.C index 8598df60..bf9f0d53 100644 --- a/cde/programs/dtinfo/dtinfo/src/Agents/SearchScopeList.C +++ b/cde/programs/dtinfo/dtinfo/src/Agents/SearchScopeList.C @@ -76,10 +76,8 @@ #include #ifdef SVR4 -#ifndef USL #include #endif -#endif #include #include diff --git a/cde/programs/dtinfo/dtinfo/src/Basic/FolioObject.C b/cde/programs/dtinfo/dtinfo/src/Basic/FolioObject.C index 7664a131..f26be5de 100644 --- a/cde/programs/dtinfo/dtinfo/src/Basic/FolioObject.C +++ b/cde/programs/dtinfo/dtinfo/src/Basic/FolioObject.C @@ -176,7 +176,7 @@ FolioObject::notify (u_int notify_type, void *notify_data) // ///////////////////////////////////////////////////////////////// void -#if defined(SC3) || defined(__osf__) || defined(USL) || defined(__SunOS) +#if defined(SC3) || defined(__osf__) || defined(__SunOS) FolioObject::add_dependent (FolioObject *dependent, notify_handler_t handler, #else FolioObject::add_dependent (void *dependent, notify_handler_t handler, @@ -184,7 +184,7 @@ FolioObject::add_dependent (void *dependent, notify_handler_t handler, u_int notify_type, void *dependent_data) { // Adds to begining because that's easiest. -#if defined(SC3) || defined(__osf__) || defined(USL) || defined(__SunOS) +#if defined(SC3) || defined(__osf__) || defined(__SunOS) f_dependents = new Dependent (&f_dependents, f_dependents, dependent, NULL, handler, notify_type, dependent_data); @@ -206,7 +206,7 @@ FolioObject::add_dependent (void *dependent, notify_handler_t handler, // by mistake like this. We'll just have to cast it to a FolioObject // when the call through it is made and hope the compiler doesn't // expect it to point to an actual FolioObject (or whatever, eg: WWL). -#if defined(SC3) || defined(__osf__) || defined(USL) || defined(__SunOS) +#if defined(SC3) || defined(__osf__) || defined(__SunOS) ON_DEBUG(printf ("@@@ adding to depend_on_list of %p\n", dependent)); dependent->f_depend_on_list = new DependOnList (dependent->f_depend_on_list, f_dependents); @@ -244,7 +244,7 @@ FolioObject::remove_depend_on (FolioObject *target, Dependent *d) // ///////////////////////////////////////////////////////////////// void -#if defined(SC3) || defined(__osf__) || defined(USL) || defined(__SunOS) +#if defined(SC3) || defined(__osf__) || defined(__SunOS) FolioObject::remove_dependent (FolioObject *dependent, #else FolioObject::remove_dependent (void *dependent, @@ -258,7 +258,7 @@ FolioObject::remove_dependent (void *dependent, // That means that each handler added must be removed! for (d = &f_dependents; *d != NULL; d = &((*d)->f_next)) { -#if defined(SC3) || defined(__osf__) || defined(USL) || defined(__SunOS) +#if defined(SC3) || defined(__osf__) || defined(__SunOS) if ((*d)->f_dependent == dependent && #else if ((*d)->f_dependent == (FolioObject*)dependent && @@ -272,7 +272,7 @@ FolioObject::remove_dependent (void *dependent, // f_folio_object will be NULL if the Dependent object was // created in add_dependent! DJB 11/10/92 assert ((*d)->f_folio_object != NULL); -#if defined(SC3) || defined(__osf__) || defined(USL) || defined(__SunOS) +#if defined(SC3) || defined(__osf__) || defined(__SunOS) remove_depend_on (dependent, *d); #else remove_depend_on ((FolioObject*)dependent, *d); @@ -342,7 +342,7 @@ FolioObject::release_depend_on_list() // by deleting that handle!!! void -#if defined(SC3) || defined(__osf__) || defined(USL) || defined(__SunOS) +#if defined(SC3) || defined(__osf__) || defined(__SunOS) FolioObject::observe (FolioObject *real_this, FolioObject *target, #else FolioObject::observe (void *real_this, FolioObject *target, @@ -358,7 +358,7 @@ FolioObject::observe (void *real_this, FolioObject *target, // --- // OK, instead we will have to pass in the "real" this pointer which // may be different from the this pointer visible in this routine. -#if defined(SC3) || defined(__osf__) || defined(USL) || defined(__SunOS) +#if defined(SC3) || defined(__osf__) || defined(__SunOS) target->f_dependents = new Dependent (&target->f_dependents, target->f_dependents, real_this, this, diff --git a/cde/programs/dtinfo/dtinfo/src/Basic/FolioObject.hh b/cde/programs/dtinfo/dtinfo/src/Basic/FolioObject.hh index 08ba425c..8ed6b0c8 100644 --- a/cde/programs/dtinfo/dtinfo/src/Basic/FolioObject.hh +++ b/cde/programs/dtinfo/dtinfo/src/Basic/FolioObject.hh @@ -94,7 +94,7 @@ public: // functions #define AddDependentd(CB, TYPE, DATA) \ add_dependent (this, (notify_handler_t)CB, TYPE, DATA) -#if defined(SC3) || defined(__osf__) || defined(USL) || defined(__SunOS) +#if defined(SC3) || defined(__osf__) || defined(__SunOS) void add_dependent (FolioObject *dependent, notify_handler_t handler, u_int notify_type, void *dependent_data = NULL); #else @@ -107,7 +107,7 @@ public: // functions #define RemoveDependentd(CB, TYPE, DATA) \ remove_dependent(this, (notify_handler_t)CB, TYPE, DATA) -#if defined(SC3) || defined(__osf__) || defined(USL) || defined(__SunOS) +#if defined(SC3) || defined(__osf__) || defined(__SunOS) void remove_dependent (FolioObject *dependent, notify_handler_t handler, u_int notify_type, void *dependent_data = NULL); #else @@ -123,7 +123,7 @@ public: // functions #define Observed(TARG, TYPE, CB, DATA) \ observe (this, TARG, (notify_handler_t) CB, TYPE, DATA) -#if defined(SC3) || defined(__osf__) || defined(USL) || defined(__SunOS) +#if defined(SC3) || defined(__osf__) || defined(__SunOS) void observe (FolioObject *real_this, FolioObject *target, notify_handler_t callback, u_int notify_type, void *client_data = NULL); diff --git a/cde/programs/dtinfo/dtinfo/src/Basic/List.C b/cde/programs/dtinfo/dtinfo/src/Basic/List.C index 6d4a0080..ae2e8fe8 100644 --- a/cde/programs/dtinfo/dtinfo/src/Basic/List.C +++ b/cde/programs/dtinfo/dtinfo/src/Basic/List.C @@ -46,28 +46,6 @@ #include "Prelude.h" - -#ifdef USL - -strcasecmp(register const char *s1, - register const char *s2) -{ - register int c1, c2; - - while (*s1 && *s2) { - c1 = isupper(*s1) ? tolower(*s1) : *s1; - c2 = isupper(*s2) ? tolower(*s2) : *s2; - if (c1 != c2) - return (c1 - c2); - s1++; - s2++; - } - return (int) (*s1 - *s2); -} - -#endif - - // ///////////////////////////////////////////////////////////////// // class constructor // ///////////////////////////////////////////////////////////////// diff --git a/cde/programs/dtinfo/dtinfo/src/Basic/OrderList.C b/cde/programs/dtinfo/dtinfo/src/Basic/OrderList.C index 6a71dd79..5e1d52f6 100644 --- a/cde/programs/dtinfo/dtinfo/src/Basic/OrderList.C +++ b/cde/programs/dtinfo/dtinfo/src/Basic/OrderList.C @@ -26,10 +26,7 @@ #define C_OrderList #define L_Basic #include - -#if !defined(USL) #include -#endif // ////////////////////////////////////////////////////////////// // Public methods diff --git a/cde/programs/dtinfo/dtinfo/src/Imakefile b/cde/programs/dtinfo/dtinfo/src/Imakefile index a93d4950..89fb7cfa 100644 --- a/cde/programs/dtinfo/dtinfo/src/Imakefile +++ b/cde/programs/dtinfo/dtinfo/src/Imakefile @@ -38,8 +38,6 @@ DependSubdirs($(SUBDIRS)) SYS_LIBRARIES=-L/usr/lib/X11/Metro/lib -lnsl -lsocked -lgen #elif defined(RsArchitecture) || defined(AIXArchitecture) SYS_LIBRARIES=-lm -liconv /usr/lib/libpthreads.a -blibpath:/usr/dt/lib:/X11/lib:/usr/lib/threads:/usr/lib:/lib -#elif defined(USLArchitecture) -SYS_LIBRARIES=-lm -lfs #elif defined(HPArchitecture) SYS_LIBRARIES=$(DYNAMIC) -lm #elif defined(LinuxArchitecture) @@ -316,7 +314,7 @@ includes:: Prelude.h dfiles messages #if defined(HPArchitecture) ||defined (AIXArchitecture) || \ defined(AlphaArchitecture) || \ (defined(SunArchitecture) && CplusplusCompilerMajorVersion < 6) || \ - defined(USLArchitecture) || defined(BSDArchitecture) + defined(BSDArchitecture) # ifndef Dont_Use_Templates_Repository # define Dont_Use_Templates_Repository UAS_INCLUDES=-I./UAS/Base @@ -326,10 +324,6 @@ SUBDIR_TEMPL_INCLUDES=$(UAS_INCLUDES) $(DTSEARCH_INCLUDES) $(COMMON_CLASS_INCLUD #if defined(HPArchitecture) SpecialCPlusPlusObjectRule(Templates.o,,+pti all_tmpls $(SUBDIR_TEMPL_INCLUDES)) -#elif defined(USLArchitecture) -SpecialCPlusPlusObjectRule(Templates.o,,+Tall $(SUBDIR_TEMPL_INCLUDES)) -SpecialCPlusPlusObjectRule(Templates2.o,,+Tall $(SUBDIR_TEMPL_INCLUDES)) -SpecialCPlusPlusObjectRule(Templates3.o,,+Tall $(SUBDIR_TEMPL_INCLUDES)) #elif (defined(SunArchitecture) && CplusplusCompilerMajorVersion < 4) SpecialCPlusPlusObjectRule(Templates.o,,+Tall_tmpls $(SUBDIR_TEMPL_INCLUDES)) #elif defined(AlphaArchitecture) @@ -381,7 +375,7 @@ makelibTsubsubdir(UAS,MMDB) #endif -#if defined(Dont_Use_Templates_Repository) && (defined(AlphaArchitecture) || defined(USLArchitecture)) +#if defined(Dont_Use_Templates_Repository) && defined(AlphaArchitecture) DEPLIBS=$(OLIASLIBS) $(UAS_TEMPLATES) $(OLIAS)/mmdb/libMMDB.a Templates.o Templates2.o Templates3.o LOCAL_LIBRARIES=$(Libs) Templates.o Templates2.o Templates3.o #elif defined (AIXArchitecture) @@ -433,11 +427,7 @@ clean:: dfiles:: foreach_subdirs(dfiles, $(CLASSLIBS)) -#if defined(USLArchitecture) -GENCAT=gencat -m -#else GENCAT=gencat -#endif #define MACRO_Messages @(messages=; \ @@\ for i in $(MSGS) ; \ @@\ diff --git a/cde/programs/dtinfo/dtinfo/src/Managers/MarkMgr.C b/cde/programs/dtinfo/dtinfo/src/Managers/MarkMgr.C index 24487fad..fd5cc77f 100644 --- a/cde/programs/dtinfo/dtinfo/src/Managers/MarkMgr.C +++ b/cde/programs/dtinfo/dtinfo/src/Managers/MarkMgr.C @@ -103,9 +103,6 @@ using namespace std; #endif #include -#ifdef USL -#include -#endif LONG_LIVED_CC (MarkMgr,mark_mgr) diff --git a/cde/programs/dtinfo/dtinfo/src/Preferences/BooleanPref.C b/cde/programs/dtinfo/dtinfo/src/Preferences/BooleanPref.C index 644c2922..cf84b745 100644 --- a/cde/programs/dtinfo/dtinfo/src/Preferences/BooleanPref.C +++ b/cde/programs/dtinfo/dtinfo/src/Preferences/BooleanPref.C @@ -61,7 +61,7 @@ #include -#if defined(AIX) || defined(USL) +#if defined(AIX) /* For strcasecmp() */ #include #endif diff --git a/cde/programs/dtinfo/dtinfo/src/Preferences/UserPreference.C b/cde/programs/dtinfo/dtinfo/src/Preferences/UserPreference.C index 049bddaf..c0f2ca4f 100644 --- a/cde/programs/dtinfo/dtinfo/src/Preferences/UserPreference.C +++ b/cde/programs/dtinfo/dtinfo/src/Preferences/UserPreference.C @@ -63,7 +63,7 @@ #include #include #include -#if !defined(hpux) && !defined(__osf__) && !defined(USL) && \ +#if !defined(hpux) && !defined(__osf__) && \ !defined(linux) && !defined(CSRG_BASED) && !defined(sun) #include #endif diff --git a/cde/programs/dtinfo/dtinfo/src/Query/QueryTerm.C b/cde/programs/dtinfo/dtinfo/src/Query/QueryTerm.C index 53956428..5264c8a1 100644 --- a/cde/programs/dtinfo/dtinfo/src/Query/QueryTerm.C +++ b/cde/programs/dtinfo/dtinfo/src/Query/QueryTerm.C @@ -81,7 +81,7 @@ #endif #include -#if defined(USL) || defined(linux) || defined(CSRG_BASED) +#if defined(linux) || defined(CSRG_BASED) #include #endif diff --git a/cde/programs/dtinfo/dtinfo/src/Support/xList.C b/cde/programs/dtinfo/dtinfo/src/Support/xList.C index ab721ff7..417c293f 100644 --- a/cde/programs/dtinfo/dtinfo/src/Support/xList.C +++ b/cde/programs/dtinfo/dtinfo/src/Support/xList.C @@ -99,15 +99,7 @@ xList::append (const T &element) template void xList::remove (List_Iterator &it) { - -#ifndef USL delete (Link *) List_base::remove (it); -#else - // this is obviously a memory leak on novell, but - // i can't get the novell compiler to allow this delete - // "argument of delete too complicated (must be simple identifier)" - List_base::remove (it); -#endif } #endif /* _xList_cc */ diff --git a/cde/programs/dtinfo/dtinfo/src/Support/xList.hh b/cde/programs/dtinfo/dtinfo/src/Support/xList.hh index e05f31f7..08334ac3 100644 --- a/cde/programs/dtinfo/dtinfo/src/Support/xList.hh +++ b/cde/programs/dtinfo/dtinfo/src/Support/xList.hh @@ -72,7 +72,7 @@ private: template #if defined(_IBMR2) || defined(__osf__) || \ - defined(USL) || defined(linux) || defined(CSRG_BASED) || defined(sun) + defined(linux) || defined(CSRG_BASED) || defined(sun) class xList : public List_base #else class xList : private List_base @@ -83,7 +83,7 @@ class xList : private List_base #ifdef SC3 friend class List_Iterator; #else -#if !defined(_IBMR2) && !defined(__osf__) && !defined(USL) && \ +#if !defined(_IBMR2) && !defined(__osf__) && \ !defined(linux) && !defined(CSRG_BASED) && !defined(sun) template friend class List_Iterator; #endif diff --git a/cde/programs/dtinfo/dtinfo/src/Templates.C b/cde/programs/dtinfo/dtinfo/src/Templates.C index 777dc447..bdb34c9c 100644 --- a/cde/programs/dtinfo/dtinfo/src/Templates.C +++ b/cde/programs/dtinfo/dtinfo/src/Templates.C @@ -277,145 +277,6 @@ class UpdateMenu; #else -#ifdef USL - -#pragma instantiate CC_TValSlist -#pragma instantiate CC_TValSlistIterator -#pragma instantiate UAS_Receiver -#pragma instantiate UAS_PtrList -#pragma instantiate UAS_Pointer - -#pragma instantiate UAS_Pointer -#pragma instantiate UAS_Pointer -#pragma instantiate UAS_Pointer -#pragma instantiate UAS_Pointer -#pragma instantiate UAS_Pointer -#pragma instantiate UAS_Pointer -#pragma instantiate UAS_Pointer -#pragma instantiate UAS_Pointer - -#pragma instantiate UAS_List -#pragma instantiate UAS_List -#pragma instantiate UAS_List -#pragma instantiate UAS_List - -#pragma instantiate UAS_List - -#pragma instantiate UAS_PtrList -#pragma instantiate UAS_PtrList -#pragma instantiate UAS_PtrList - -#pragma instantiate UAS_Pointer -#pragma instantiate UAS_Pointer -#pragma instantiate UAS_Pointer -#pragma instantiate UAS_Pointer -#pragma instantiate UAS_Pointer - -#pragma instantiate Dict > -#pragma instantiate Dict -#pragma instantiate Dict - -#pragma instantiate DictIter -#pragma instantiate DictIter > -#pragma instantiate UAS_List -#pragma instantiate UAS_List -#pragma instantiate UAS_List > - -#pragma instantiate UAS_ObjList - -#pragma instantiate xList -#pragma instantiate xList > -#pragma instantiate xList -#pragma instantiate xList -#pragma instantiate xList -#pragma instantiate xList -#pragma instantiate xList -#pragma instantiate xList -#pragma instantiate xList -#pragma instantiate xList > -#pragma instantiate xList -#pragma instantiate xList -#pragma instantiate xList -#pragma instantiate xList - -#pragma instantiate xList > -#pragma instantiate xList -#pragma instantiate xList -#pragma instantiate xList -#pragma instantiate xList -#pragma instantiate xList -#pragma instantiate xList -#pragma instantiate xList -#pragma instantiate xList -#pragma instantiate xList
-#pragma instantiate xList -#pragma instantiate xList - -#pragma instantiate UAS_Sender -#pragma instantiate UAS_Sender -#pragma instantiate UAS_Sender -#pragma instantiate UAS_Sender -#pragma instantiate UAS_Sender -#pragma instantiate UAS_Sender -#pragma instantiate UAS_Sender -#pragma instantiate UAS_Sender -#pragma instantiate UAS_Sender -#pragma instantiate UAS_Sender -#pragma instantiate UAS_Sender -#pragma instantiate UAS_PtrList > -#pragma instantiate UAS_PtrList > -#pragma instantiate UAS_Sender -#pragma instantiate UAS_Sender -#pragma instantiate UAS_Sender -#pragma instantiate UAS_Sender -#pragma instantiate UAS_Sender -#pragma instantiate UAS_Sender -#pragma instantiate UAS_Sender -#pragma instantiate UAS_Sender -#pragma instantiate UAS_Sender -#pragma instantiate UAS_Sender -#pragma instantiate UAS_Sender -#pragma instantiate UAS_Sender -#pragma instantiate UAS_Sender -#pragma instantiate UAS_Sender -#pragma instantiate UAS_Sender - -#pragma instantiate UAS_Receiver -#pragma instantiate UAS_Receiver -#pragma instantiate UAS_Receiver -#pragma instantiate UAS_Receiver -#pragma instantiate UAS_Receiver -#pragma instantiate UAS_Receiver -#pragma instantiate UAS_Receiver -#pragma instantiate UAS_Receiver -#pragma instantiate UAS_Receiver -#pragma instantiate UAS_Receiver -#pragma instantiate UAS_Receiver -#pragma instantiate UAS_Receiver -#pragma instantiate UAS_Receiver -#pragma instantiate UAS_Receiver - -#pragma instantiate Stack -#pragma instantiate Stack - -#pragma instantiate Stack<_dtCvSegment*> -#pragma instantiate Stack -#pragma instantiate Stack -#pragma instantiate Stack -#pragma instantiate Stack - -#pragma instantiate CC_TPtrSlist -#pragma instantiate CC_TPtrSlist -#pragma instantiate CC_TPtrSlist - -#pragma instantiate hashTable -#pragma instantiate Stack - -#pragma instantiate CC_TPtrDlist -#pragma instantiate UAS_Pointer > - -#else - #ifdef __osf__ #pragma define_template CC_TValSlist diff --git a/cde/programs/dtinfo/dtinfo/src/Templates2.C b/cde/programs/dtinfo/dtinfo/src/Templates2.C index 23bfd4eb..e67a3a79 100644 --- a/cde/programs/dtinfo/dtinfo/src/Templates2.C +++ b/cde/programs/dtinfo/dtinfo/src/Templates2.C @@ -262,76 +262,3 @@ CC_Boolean kv_pair::f_needRemove = FALSE; CC_Boolean kv_pair::f_needRemove = FALSE; #endif - - -#ifdef USL - -#pragma instantiate xList -#pragma instantiate UAS_PtrList > -#pragma instantiate UAS_PtrList > -#pragma instantiate UAS_PtrList > -#pragma instantiate UAS_PtrList > -#pragma instantiate hashTable -#pragma instantiate UAS_PtrList > -#pragma instantiate UAS_PtrList > -#pragma instantiate UAS_PtrList > -#pragma instantiate UAS_Pointer -#pragma instantiate UAS_PtrList > -#pragma instantiate UAS_PtrList > -#pragma instantiate UAS_PtrList > -#pragma instantiate UAS_PtrList > -#pragma instantiate UAS_PtrList > -#pragma instantiate UAS_PtrList > -#pragma instantiate UAS_List -#pragma instantiate UAS_Pointer -#pragma instantiate UAS_PtrList > -#pragma instantiate UAS_PtrList > -#pragma instantiate UAS_PtrList > -#pragma instantiate UAS_PtrList > -#pragma instantiate UAS_Pointer -#pragma instantiate UAS_PtrList > -#pragma instantiate UAS_PtrList > -#pragma instantiate UAS_Pointer -#pragma instantiate CC_TPtrSlist > -#pragma instantiate pointer_vector > > -#pragma instantiate UAS_PtrList > -#pragma instantiate UAS_PtrList > -#pragma instantiate UAS_PtrList > -#pragma instantiate UAS_PtrList > -#pragma instantiate UAS_PtrList > -#pragma instantiate UAS_PtrList > -#pragma instantiate UAS_PtrList > -#pragma instantiate UAS_PtrList > -#pragma instantiate UAS_PtrList > - -#pragma instantiate UAS_Pointer > -#pragma instantiate UAS_PtrList > -#pragma instantiate UAS_PtrList > -#pragma instantiate UAS_PtrList > -#pragma instantiate CC_TValSlist -#pragma instantiate CC_TValSlist -#pragma instantiate CC_TValSlist<_dtCvSegment*> -#pragma instantiate CC_TValSlist -#pragma instantiate CC_TValSlist -#pragma instantiate CC_TValSlist -#pragma instantiate UAS_Receiver -#pragma instantiate UAS_PtrList > -#pragma instantiate CC_TValSlist - -#pragma instantiate kv_pair -#pragma instantiate kv_pair -#pragma instantiate kv_pair -#pragma instantiate CC_TPtrSlist > -#pragma instantiate pointer_vector > > -#pragma instantiate CC_TValSlist -#pragma instantiate CC_TValSlistIterator -#pragma instantiate CC_TValSlistIterator -#pragma instantiate CC_TValSlistIterator -#pragma instantiate CC_TValSlistIterator -#pragma instantiate CC_TValSlistIterator -#pragma instantiate CC_TValSlistIterator<_dtCvSegment*> -#pragma instantiate CC_TValSlistIterator - -#pragma instantiate DictIter - -#endif diff --git a/cde/programs/dtinfo/dtinfo/src/Templates3.C b/cde/programs/dtinfo/dtinfo/src/Templates3.C index 9f5fe562..093cfdb0 100644 --- a/cde/programs/dtinfo/dtinfo/src/Templates3.C +++ b/cde/programs/dtinfo/dtinfo/src/Templates3.C @@ -212,85 +212,3 @@ class RowDefn; #pragma define_template UAS_PtrList > #endif - -#ifdef USL - -// new templates - -#pragma instantiate UAS_List -#pragma instantiate UAS_List - -#pragma instantiate UAS_ObjList - -#pragma instantiate UAS_Pointer -#pragma instantiate UAS_Pointer > -#pragma instantiate UAS_Pointer > -#pragma instantiate UAS_Pointer > - -// UAS_PtrList -#pragma instantiate UAS_PtrList - -// UAS_PtrList > -#pragma instantiate UAS_PtrList > -#pragma instantiate UAS_PtrList > -#pragma instantiate UAS_PtrList > - -// UAS_PtrList > -#pragma instantiate UAS_PtrList > -#pragma instantiate UAS_PtrList > -#pragma instantiate UAS_PtrList > -#pragma instantiate UAS_PtrList > -#pragma instantiate UAS_PtrList > -#pragma instantiate UAS_PtrList > -#pragma instantiate UAS_PtrList > -#pragma instantiate UAS_PtrList > -#pragma instantiate UAS_PtrList > -#pragma instantiate UAS_PtrList > -#pragma instantiate UAS_PtrList > - -// UAS_Receiver -#pragma instantiate UAS_Receiver -#pragma instantiate UAS_Receiver -#pragma instantiate UAS_Receiver -#pragma instantiate UAS_Receiver -#pragma instantiate UAS_Receiver -#pragma instantiate UAS_Receiver -#pragma instantiate UAS_Receiver -#pragma instantiate UAS_Receiver -#pragma instantiate UAS_Receiver -#pragma instantiate UAS_Receiver -#pragma instantiate UAS_Receiver -#pragma instantiate UAS_Receiver - - -#pragma instantiate CC_TPtrSlist -#pragma instantiate Stack - -// UAS_Sender -#pragma instantiate UAS_Sender -#pragma instantiate UAS_Sender -#pragma instantiate UAS_Sender -#pragma instantiate UAS_Sender - -// UAS_PtrList > -#pragma instantiate UAS_PtrList > -#pragma instantiate UAS_PtrList > -#pragma instantiate UAS_PtrList > -#pragma instantiate UAS_PtrList > -#pragma instantiate UAS_PtrList > -#pragma instantiate UAS_PtrList > -#pragma instantiate UAS_PtrList > -#pragma instantiate UAS_PtrList > - -// UAS_PtrList > -#pragma instantiate UAS_PtrList > -#pragma instantiate UAS_PtrList > -#pragma instantiate UAS_PtrList > -#pragma instantiate UAS_PtrList > -#pragma instantiate UAS_PtrList > - -#endif diff --git a/cde/programs/dtinfo/dtinfo/src/UAS/Base/UAS_Base.hh b/cde/programs/dtinfo/dtinfo/src/UAS/Base/UAS_Base.hh index a2c45139..7a3f2343 100644 --- a/cde/programs/dtinfo/dtinfo/src/UAS/Base/UAS_Base.hh +++ b/cde/programs/dtinfo/dtinfo/src/UAS/Base/UAS_Base.hh @@ -32,7 +32,7 @@ class UAS_Base: public Destructable { UAS_Base (); virtual ~UAS_Base (); int operator == (const UAS_Base &); -#if (defined(sparc) && defined(SC3)) || defined(__osf__) || defined(USL) || defined(linux) +#if (defined(sparc) && defined(SC3)) || defined(__osf__) || defined(linux) /* SC++ 4.0.1 does not like these being protected */ #else protected: diff --git a/cde/programs/dtinfo/dtinfo/src/UAS/Base/UAS_OQLParser.C b/cde/programs/dtinfo/dtinfo/src/UAS/Base/UAS_OQLParser.C index a865ac46..2ca45224 100644 --- a/cde/programs/dtinfo/dtinfo/src/UAS/Base/UAS_OQLParser.C +++ b/cde/programs/dtinfo/dtinfo/src/UAS/Base/UAS_OQLParser.C @@ -24,7 +24,7 @@ /* Copyright (c) 1995 FUJITSU LIMITED */ /* All Rights Reserved */ -#if defined(USL) || defined(linux) || defined(CSRG_BASED) +#if defined(linux) || defined(CSRG_BASED) #include #else #include diff --git a/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_BookcaseEntry.hh b/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_BookcaseEntry.hh index 18db8d5c..f11c109f 100644 --- a/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_BookcaseEntry.hh +++ b/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_BookcaseEntry.hh @@ -66,7 +66,7 @@ class DtSR_BookcaseSearchEntry : public DtSR_BookcaseEntry UAS_Pointer bcase() { return uas_bcase; } -#if !defined(SC3) && !defined(__osf__) && !defined(USL) && !defined(linux) +#if !defined(SC3) && !defined(__osf__) && !defined(linux) protected: template friend class UAS_Pointer; diff --git a/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_SearchResults.C b/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_SearchResults.C index 9f20a203..46e662ca 100644 --- a/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_SearchResults.C +++ b/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_SearchResults.C @@ -64,13 +64,6 @@ DtSR_SearchResults::sort(UAS_Pointer > res) for (unsigned int i = 0; i < list_length; i++) { for (unsigned int j = i+1; j < list_length; j++) { -#ifdef USL - // this line does nothing, but if you remove it - // this code will not compile on novell. go figure. rCs - - UAS_Pointer reflisti = Ref_list[i]; -#endif - if (Ref_list[i]->relevance() < Ref_list[j]->relevance()) { UAS_Pointer temp = Ref_list[i]; Ref_list[i] = Ref_list[j]; diff --git a/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_SearchZones.C b/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_SearchZones.C index 71c4df1b..64c67f4b 100644 --- a/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_SearchZones.C +++ b/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_SearchZones.C @@ -28,12 +28,6 @@ #include // strcasecmp() #endif -#if defined(USL) -extern "C" { - extern char *strcasecmp (const char*, const char *); -} -#endif - #include "DtSR_SearchZones.hh" DtSR_SearchZones::uas_zones diff --git a/cde/programs/dtinfo/dtinfo/src/main.C b/cde/programs/dtinfo/dtinfo/src/main.C index 8d1146ff..5919eff9 100644 --- a/cde/programs/dtinfo/dtinfo/src/main.C +++ b/cde/programs/dtinfo/dtinfo/src/main.C @@ -59,10 +59,8 @@ #include #ifdef SVR4 -#ifndef USL #include #endif -#endif #if defined(sparc) && defined(MAP_ZERO) #include diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/ContentType.C b/cde/programs/dtinfo/dtinfogen/infolib/etc/ContentType.C index e1301d85..bf1337fa 100644 --- a/cde/programs/dtinfo/dtinfogen/infolib/etc/ContentType.C +++ b/cde/programs/dtinfo/dtinfogen/infolib/etc/ContentType.C @@ -54,8 +54,8 @@ #include -#if !defined(__osf__) && !defined(USL) && !defined(linux) && \ - !defined(CSRG_BASED) && !defined(sun) +#if !defined(__osf__) && !defined(linux) && !defined(CSRG_BASED) && \ + !defined(sun) #include #endif diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/MixedGen.C b/cde/programs/dtinfo/dtinfogen/infolib/etc/MixedGen.C index da5b84f7..bf272fed 100644 --- a/cde/programs/dtinfo/dtinfogen/infolib/etc/MixedGen.C +++ b/cde/programs/dtinfo/dtinfogen/infolib/etc/MixedGen.C @@ -34,9 +34,7 @@ #include #include #include -#if !defined(USL) #include -#endif #include "Exceptions.hh" #include "FlexBuffer.h" diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/NCFGen.C b/cde/programs/dtinfo/dtinfogen/infolib/etc/NCFGen.C index 98ec5411..0179f65d 100644 --- a/cde/programs/dtinfo/dtinfogen/infolib/etc/NCFGen.C +++ b/cde/programs/dtinfo/dtinfogen/infolib/etc/NCFGen.C @@ -24,9 +24,7 @@ #include #include -#if !defined(USL) #include -#endif #include using namespace std; diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/RemoteId.C b/cde/programs/dtinfo/dtinfogen/infolib/etc/RemoteId.C index 4acae25c..fd75da35 100644 --- a/cde/programs/dtinfo/dtinfogen/infolib/etc/RemoteId.C +++ b/cde/programs/dtinfo/dtinfogen/infolib/etc/RemoteId.C @@ -53,7 +53,7 @@ #include -#if !defined(__osf__) && !defined(USL) && !defined(linux) && \ +#if !defined(__osf__) && !defined(linux) && \ !defined(CSRG_BASED) && !defined(sun) # include #endif diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/ReplaceIdIdref.C b/cde/programs/dtinfo/dtinfogen/infolib/etc/ReplaceIdIdref.C index 8055dc0b..57b80a12 100644 --- a/cde/programs/dtinfo/dtinfogen/infolib/etc/ReplaceIdIdref.C +++ b/cde/programs/dtinfo/dtinfogen/infolib/etc/ReplaceIdIdref.C @@ -43,7 +43,7 @@ #include -#if !defined(__osf__) && !defined(USL) && !defined(linux) && \ +#if !defined(__osf__) && !defined(linux) && \ !defined(CSRG_BASED) && !defined(sun) #include #endif diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/SearchPath.C b/cde/programs/dtinfo/dtinfogen/infolib/etc/SearchPath.C index a28ba453..8bd09629 100644 --- a/cde/programs/dtinfo/dtinfogen/infolib/etc/SearchPath.C +++ b/cde/programs/dtinfo/dtinfogen/infolib/etc/SearchPath.C @@ -24,9 +24,7 @@ #include #include #include -#if !defined(USL) #include -#endif #include #include #include diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/TKTemplate.C b/cde/programs/dtinfo/dtinfogen/infolib/etc/TKTemplate.C index 678cdf4a..732839e1 100644 --- a/cde/programs/dtinfo/dtinfogen/infolib/etc/TKTemplate.C +++ b/cde/programs/dtinfo/dtinfogen/infolib/etc/TKTemplate.C @@ -77,26 +77,6 @@ CC_Boolean kv_pair::f_needRemove = FALSE; #endif -#ifdef USL -#pragma instantiate Stack -#pragma instantiate CC_TPtrSlist -#pragma instantiate hashTable -#pragma instantiate hashTable -#pragma instantiate hashTableIterator -#pragma instantiate hashTableIterator -#pragma instantiate Stack -#pragma instantiate CC_TValSlist -#pragma instantiate CC_TPtrSlist > -#pragma instantiate CC_TPtrSlist > -#pragma instantiate CC_TValSlist -#pragma instantiate CC_TValSlistIterator -#pragma instantiate CC_TValSlistIterator -#pragma instantiate kv_pair -#pragma instantiate pointer_vector > > -#pragma instantiate kv_pair -#pragma instantiate pointer_vector > > -#endif - #if !defined(__osf__) && !defined(IBMR2) typedef Stack _f1_; typedef CC_TPtrSlist _f2_; diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/gr_type.C b/cde/programs/dtinfo/dtinfogen/infolib/etc/gr_type.C index 13908025..46c1144e 100644 --- a/cde/programs/dtinfo/dtinfogen/infolib/etc/gr_type.C +++ b/cde/programs/dtinfo/dtinfogen/infolib/etc/gr_type.C @@ -54,7 +54,7 @@ #include -#if !defined(__osf__) && !defined(USL) && !defined(linux) && \ +#if !defined(__osf__) && !defined(linux) && \ !defined(CSRG_BASED) && !defined(sun) # include #else diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/lex.C b/cde/programs/dtinfo/dtinfogen/infolib/etc/lex.C index 5bfaa233..7a866f93 100644 --- a/cde/programs/dtinfo/dtinfogen/infolib/etc/lex.C +++ b/cde/programs/dtinfo/dtinfogen/infolib/etc/lex.C @@ -42,7 +42,7 @@ #ifdef __cplusplus #include -#if !defined(__osf__) && !defined(USL) && !defined(linux) && \ +#if !defined(__osf__) && !defined(linux) && \ !defined(CSRG_BASED) && !defined(sun) #include #endif @@ -191,7 +191,7 @@ typedef struct yy_buffer_state *YY_BUFFER_STATE; #define YY_CHAR unsigned char #define INITIAL 0 -#if !defined(__osf__) && !defined(USL) && !defined(linux) && \ +#if !defined(__osf__) && !defined(linux) && \ !defined(CSRG_BASED) && !defined(sun) #include #else diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/lex.l b/cde/programs/dtinfo/dtinfogen/infolib/etc/lex.l index a9cba57a..ebb787bd 100644 --- a/cde/programs/dtinfo/dtinfogen/infolib/etc/lex.l +++ b/cde/programs/dtinfo/dtinfogen/infolib/etc/lex.l @@ -1,7 +1,7 @@ %{ /* -*- c++ -*- */ /* $XConsortium: lex.l /main/5 1996/11/19 16:55:12 drk $ */ -#if !defined(__osf__) && !defined(USL) && !defined(linux) && !defined(CSRG_BASED) +#if !defined(__osf__) && !defined(linux) && !defined(CSRG_BASED) #include #else #include diff --git a/cde/programs/dtinfo/dtinfogen/mmdb/StyleSheet/Imakefile b/cde/programs/dtinfo/dtinfogen/mmdb/StyleSheet/Imakefile index 304c1def..2f51e267 100644 --- a/cde/programs/dtinfo/dtinfogen/mmdb/StyleSheet/Imakefile +++ b/cde/programs/dtinfo/dtinfogen/mmdb/StyleSheet/Imakefile @@ -13,10 +13,6 @@ TEMPLATE_OBJS= #else TEMPLATE_OBJS=$(OLIAS)/mmdb/StyleSheet/SSTemplates.o #endif - -#if defined (USLArchitecture) -SYS_LIBRARIES = -lfs -#endif MMDB_DIR=../../../mmdb diff --git a/cde/programs/dtinfo/dtinfogen/mmdb/src/Imakefile b/cde/programs/dtinfo/dtinfogen/mmdb/src/Imakefile index dd5951fc..48a55841 100644 --- a/cde/programs/dtinfo/dtinfogen/mmdb/src/Imakefile +++ b/cde/programs/dtinfo/dtinfogen/mmdb/src/Imakefile @@ -198,7 +198,7 @@ Libs_C_API = $(MMDB_LIBS_C_API) $(DTSVCLIB) $(TTLIB) $(XLIB) $(MATH_LIB) SimpleCPlusPlusProgram(dbdrv,main.o,$(Libs)) SimpleCPlusPlusProgram(restore,restore.o,$(Libs)) -#if defined(USLArchitecture) || defined(LinuxArchitecture) || \ +#if defined(LinuxArchitecture) || \ defined(BSDArchitecture) || defined(SunArchitecture) SimpleCPlusPlusProgram(dbdrv_c_api,main_c_api.o,$(Libs_C_API)) #else diff --git a/cde/programs/dtinfo/mmdb/HardCopy/Imakefile b/cde/programs/dtinfo/mmdb/HardCopy/Imakefile index 01941f13..da8faa10 100644 --- a/cde/programs/dtinfo/mmdb/HardCopy/Imakefile +++ b/cde/programs/dtinfo/mmdb/HardCopy/Imakefile @@ -42,10 +42,6 @@ XCOMM need the ptr repository CXXEXTRA_DEFINES = -ptr../templates #endif -#if defined(USLArchitecture) -CXXEXTRA_DEFINES = -Xo -#endif - #if defined(HPArchitecture) || defined(LinuxArchitecture) || defined(BSDArchitecture) || !defined(CplusplusCompilerMajorVersion) || (CplusplusCompilerMajorVersion != 4) LinkSourceFile(TemplatesAutoNumber.C,$(DTMMDBSRC)/HardCopy) diff --git a/cde/programs/dtinfo/mmdb/StyleSheet/Imakefile b/cde/programs/dtinfo/mmdb/StyleSheet/Imakefile index 677a99c9..a8da4fc2 100644 --- a/cde/programs/dtinfo/mmdb/StyleSheet/Imakefile +++ b/cde/programs/dtinfo/mmdb/StyleSheet/Imakefile @@ -56,10 +56,6 @@ XCOMM need the ptr repository CXXEXTRA_DEFINES = -ptr../templates #endif -#if defined(USLArchitecture) -CXXEXTRA_DEFINES = -Xo -#endif - LinkSourceFile(Attribute.C,$(DTMMDBSRC)/StyleSheet) LinkSourceFile(AttributeList.C,$(DTMMDBSRC)/StyleSheet) LinkSourceFile(BitVector.C,$(DTMMDBSRC)/StyleSheet) diff --git a/cde/programs/dtinfo/tools/misc/msgsets.C b/cde/programs/dtinfo/tools/misc/msgsets.C index 9e2e6625..72330b1e 100644 --- a/cde/programs/dtinfo/tools/misc/msgsets.C +++ b/cde/programs/dtinfo/tools/misc/msgsets.C @@ -42,7 +42,7 @@ #ifdef __cplusplus #include -#if !defined(__DECCXX) && !defined(USL) && !defined(linux) && !defined(CSRG_BASED) && !defined(sun) +#if !defined(__DECCXX) && !defined(linux) && !defined(CSRG_BASED) && !defined(sun) #include #else #include diff --git a/cde/programs/dtksh/Imakefile b/cde/programs/dtksh/Imakefile index 9cf8a24c..532238b5 100644 --- a/cde/programs/dtksh/Imakefile +++ b/cde/programs/dtksh/Imakefile @@ -37,11 +37,6 @@ LOCAL_LDFLAGS = -bE:dtksh.exp EXTRA_DEFINES = -DDYNLIB #endif -#if defined (USLArchitecture) -EXTRA_DEFINES = -DDYNLIB -LOCAL_LDFLAGS = -Wl,-Bexport:dtksh.exp -#endif - #if defined(HPOSFArchitecture) #endif diff --git a/cde/programs/dtksh/README-DEVELOPER b/cde/programs/dtksh/README-DEVELOPER index 33daa552..10ce00e6 100644 --- a/cde/programs/dtksh/README-DEVELOPER +++ b/cde/programs/dtksh/README-DEVELOPER @@ -304,14 +304,6 @@ will work. The files which must be modified are: Modification 4: --------------- -During CDE development, USL needed to add an 'ifndef __USLC__' around -a certain define. The file which needs the change is: - - src/lib/libast/sfio/sfhdr.h - -Modification 5: ---------------- - There appears to be a bug in the ksh93 build process, which shows up on the HP platform. David Korn was unable to find the cause, so we need to modify one of his build scripts: diff --git a/cde/programs/dtksh/ksh93/src/cmd/ksh93/sh/init.c b/cde/programs/dtksh/ksh93/src/cmd/ksh93/sh/init.c index 845bb1e0..ef1d634a 100644 --- a/cde/programs/dtksh/ksh93/src/cmd/ksh93/sh/init.c +++ b/cde/programs/dtksh/ksh93/src/cmd/ksh93/sh/init.c @@ -120,9 +120,6 @@ # undef isblank # define isblank(x) iswblank(x) # if !_lib_iswblank -#if defined(USL) -#include -#endif static int iswblank __PARAM__((wint_t wc), (wc)) __OTORP__(wint_t wc;){ diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfhdr.h b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfhdr.h index 8a17652c..beff9cbb 100644 --- a/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfhdr.h +++ b/cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfhdr.h @@ -623,9 +623,7 @@ extern double frexp _ARG_((double, int*)); extern double ldexp _ARG_((double,int)); extern int getpagesize _ARG_((void)); -#ifndef __USLC__ extern Void_t* memccpy _ARG_((Void_t*, const Void_t*, int, size_t)); -#endif #if !_PACKAGE_ast extern void bcopy _ARG_((const Void_t*, Void_t*, int)); diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/string/strmatch.c b/cde/programs/dtksh/ksh93/src/lib/libast/string/strmatch.c index 3e47f58b..5c44d4cc 100644 --- a/cde/programs/dtksh/ksh93/src/lib/libast/string/strmatch.c +++ b/cde/programs/dtksh/ksh93/src/lib/libast/string/strmatch.c @@ -130,10 +130,6 @@ #if !_lib_iswblank -#ifdef USL -#include -#endif - static int iswblank __PARAM__((wint_t wc), (wc)) __OTORP__(wint_t wc;){ static int initialized; diff --git a/cde/programs/dtksh/xmcmds.c b/cde/programs/dtksh/xmcmds.c index 275e4aa7..798c3eda 100644 --- a/cde/programs/dtksh/xmcmds.c +++ b/cde/programs/dtksh/xmcmds.c @@ -3737,7 +3737,7 @@ do_catopen( char * ptr; nl_catd nlmsg_fd = (nl_catd)-1; char * errmsg; -#if defined(SVR4) || defined (_AIX) || defined(sco) || defined(DEC) || \ +#if defined(SVR4) || defined (_AIX) || defined(DEC) || \ defined(CSRG_BASED) || defined(linux) || defined(sun) char * nextMatch; #endif @@ -3762,7 +3762,7 @@ do_catopen( */ altCatName = XtMalloc(strlen(catName) + 10); -#if defined(SVR4) || defined (_AIX) || defined(sco) || defined(DEC) || \ +#if defined(SVR4) || defined (_AIX) || defined(DEC) || \ defined(CSRG_BASED) || defined(linux) || defined(sun) /* These platforms don't have strrstr() */ ptr = NULL; diff --git a/cde/programs/dtlogin/Imakefile b/cde/programs/dtlogin/Imakefile index dae8adac..4143de6c 100644 --- a/cde/programs/dtlogin/Imakefile +++ b/cde/programs/dtlogin/Imakefile @@ -115,10 +115,6 @@ SYS_LIBRARIES = -lm -ldl -lgen -lresolv -lbsm -lcmd $(PAM_LIB) # endif #endif -#if defined(USLArchitecture) -SYS_LIBRARIES = -lm -ldl -lgen -lresolv -#endif - #if defined(RsArchitecture) SYS_LIBRARIES = -ls #endif @@ -167,14 +163,14 @@ INCLUDES = -I$(XPROJECTROOT)/include/freetype2 dpylist.c error.c file.c mitauth.c protodpy.c policy.c \ reset.c resource.c server.c session.c socket.c util.c \ verify.c version.c apollo.c sysauth.c fontpath.c $(DESSRCS) \ - qualify.c usl_ptty.c choose.c netaddr.c xdmcp.c \ + qualify.c choose.c netaddr.c xdmcp.c \ $(PAM_SRCS) $(SOLARIS_SRCS) OBJS1 = access.o account.o auth.o genauth.o daemon.o dm.o \ dpylist.o error.o file.o mitauth.o protodpy.o policy.o \ reset.o resource.o server.o session.o socket.o util.o \ verify.o version.o apollo.o sysauth.o fontpath.o $(DESOBJS) \ - qualify.o usl_ptty.o choose.o netaddr.o xdmcp.o \ + qualify.o choose.o netaddr.o xdmcp.o \ $(PAM_OBJS) $(SOLARIS_OBJS) PROG2 = dtgreet @@ -322,22 +318,6 @@ EXTRA_RES_DEFINES = \ LOCAL_LIBRARIES2 = $(BASE_LIBS2) LOCAL_LIBRARIES3 = $(BASE_LIBS3) - -/* USL needs to resolve all Xt symbols invoked by Xmu at shared - * library link time. - * Likewise for the BMS references from libDt for vuegreet. - */ -#if defined(USLArchitecture) -# if HasSharedLibraries - BASE_LIBS1 = $(XAUTHLIB) $(LOGINXMULIB) $(XDMCPLIB) $(XTOOLLIB) \ - $(LOGINXLIB) - BASE_LIBS2 = $(DTWIDGETLIB) $(DTSVCLIB) $(TTLIB) \ - $(XMLIB) $(XTOOLLIB) $(XLIB) -# endif -#endif - - - /************************************************************************** * * Extra things for the HP-UX BLS version diff --git a/cde/programs/dtlogin/auth.c b/cde/programs/dtlogin/auth.c index 039d4d9a..d690bae2 100644 --- a/cde/programs/dtlogin/auth.c +++ b/cde/programs/dtlogin/auth.c @@ -131,9 +131,6 @@ extern int errno; #ifdef SVR4 # include # include -#ifdef USL -# include -#endif #endif #ifdef __convex__ # include @@ -784,35 +781,6 @@ DefineLocal (FILE *file, Xauth *auth) #endif } -#ifdef USL -/* Deal with different SIOCGIFCONF ioctl semantics on UnixWare */ -static int -ifioctl (int fd, int cmd, char *arg) -{ - struct strioctl ioc; - int ret; - - bzero((char *) &ioc, sizeof(ioc)); - ioc.ic_cmd = cmd; - ioc.ic_timout = 0; - if (cmd == SIOCGIFCONF) - { - ioc.ic_len = ((struct ifconf *) arg)->ifc_len; - ioc.ic_dp = ((struct ifconf *) arg)->ifc_buf; - } - else - { - ioc.ic_len = sizeof(struct ifreq); - ioc.ic_dp = arg; - } - ret = ioctl(fd, I_STR, (char *) &ioc); - if (ret >= 0 && cmd == SIOCGIFCONF) - ((struct ifconf *) arg)->ifc_len = ioc.ic_len; - return(ret); -} -#endif /* USL */ - - #ifdef WINTCP /* NCR with Wollongong TCP */ #include @@ -920,11 +888,7 @@ DefineSelf (fd, file, auth) ifc.ifc_len = sizeof (buf); ifc.ifc_buf = buf; -#ifdef USL - if (ifioctl (fd, SIOCGIFCONF, (char *) &ifc) < 0) -#else if (ioctl (fd, SIOCGIFCONF, (char *) &ifc) < 0) -#endif #ifdef __osf__ switch (addr_family) { diff --git a/cde/programs/dtlogin/config/Xresources.src b/cde/programs/dtlogin/config/Xresources.src index bab7dcc4..3735826b 100644 --- a/cde/programs/dtlogin/config/Xresources.src +++ b/cde/programs/dtlogin/config/Xresources.src @@ -452,113 +452,6 @@ Dtlogin*tr_TR.ISO8859-9.languageName: %|nls-447-#Turkish#| #endif /* __osf__ */ -#if defined (USL) -!!###################################################################### -!! -!! LANGUAGE MENU NAME MAPPINGS - -#undef C -XCOMM undef C - -Dtlogin*C.languageName: %|nls-600-##| -Dtlogin*POSIX.languageName: %|nls-601-##| -Dtlogin*da.languageName: %|nls-602-##| -Dtlogin*da_DK.850.languageName: %|nls-603-##| -Dtlogin*da_DK.865.languageName: %|nls-604-##| -Dtlogin*de.languageName: %|nls-605-##| -Dtlogin*de_DE.437.languageName: %|nls-606-##| -Dtlogin*de_DE.850.languageName: %|nls-607-##| -Dtlogin*de_AT.languageName: %|nls-608-##| -Dtlogin*de_AT.437.languageName: %|nls-609-##| -Dtlogin*de_AT.850.languageName: %|nls-610-##| -Dtlogin*de_CH.languageName: %|nls-611-##| -Dtlogin*de_CH.437.languageName: %|nls-612-##| -Dtlogin*de_CH.850.languageName: %|nls-613-##| -Dtlogin*el.languageName: %|nls-614-##| -Dtlogin*en.languageName: %|nls-615-##| -Dtlogin*en_GB.437.languageName: %|nls-616-##| -Dtlogin*en_GB.646.languageName: %|nls-617-##| -Dtlogin*en_GB.850.languageName: %|nls-618-##| -Dtlogin*en_AU.languageName: %|nls-619-##| -Dtlogin*en_AU.437.languageName: %|nls-620-##| -Dtlogin*en_AU.646.languageName: %|nls-621-##| -Dtlogin*en_AU.850.languageName: %|nls-622-##| -Dtlogin*en_CA.languageName: %|nls-623-##| -Dtlogin*en_CA.437.languageName: %|nls-624-##| -Dtlogin*en_CA.646.languageName: %|nls-625-##| -Dtlogin*en_CA.850.languageName: %|nls-626-##| -Dtlogin*en_IR.languageName: %|nls-627-##| -Dtlogin*en_IR.437.languageName: %|nls-628-##| -Dtlogin*en_IR.850.languageName: %|nls-629-##| -Dtlogin*en_IR.646.languageName: %|nls-630-##| -Dtlogin*en_NZ.languageName: %|nls-631-##| -Dtlogin*en_NZ.437.languageName: %|nls-632-##| -Dtlogin*en_NZ.850.languageName: %|nls-633-##| -Dtlogin*en_NZ.646.languageName: %|nls-634-##| -Dtlogin*en_US.languageName: %|nls-635-##| -Dtlogin*en_US.437.languageName: %|nls-636-##| -Dtlogin*en_US.646.languageName: %|nls-637-##| -Dtlogin*en_US.850.languageName: %|nls-638-##| -Dtlogin*es.languageName: %|nls-639-##| -Dtlogin*es_ES.437.languageName: %|nls-640-##| -Dtlogin*es_ES.850.languageName: %|nls-641-##| -Dtlogin*es_AR.languageName: %|nls-642-##| -Dtlogin*es_AR.437.languageName: %|nls-643-##| -Dtlogin*es_AR.850.languageName: %|nls-644-##| -Dtlogin*es_CL.languageName: %|nls-645-##| -Dtlogin*es_CL.437.languageName: %|nls-646-##| -Dtlogin*es_CL.850.languageName: %|nls-647-##| -Dtlogin*es_MX.languageName: %|nls-648-##| -Dtlogin*es_MX.437.languageName: %|nls-649-##| -Dtlogin*es_MX.850.languageName: %|nls-650-##| -Dtlogin*es_VE.languageName: %|nls-651-##| -Dtlogin*es_VE.437.languageName: %|nls-652-##| -Dtlogin*es_VE.850.languageName: %|nls-653-##| -Dtlogin*fi.languageName: %|nls-654-##| -Dtlogin*fi_FI.437.languageName: %|nls-655-##| -Dtlogin*fi_FI.850.languageName: %|nls-656-##| -Dtlogin*fr.languageName: %|nls-657-##| -Dtlogin*fr_FR.437.languageName: %|nls-658-##| -Dtlogin*fr_FR.850.languageName: %|nls-659-##| -Dtlogin*fr_BE.languageName: %|nls-660-##| -Dtlogin*fr_BE.437.languageName: %|nls-661-##| -Dtlogin*fr_BE.850.languageName: %|nls-662-##| -Dtlogin*fr_CA.languageName: %|nls-663-##| -Dtlogin*fr_CA.850.languageName: %|nls-664-##| -Dtlogin*fr_CA.863.languageName: %|nls-665-##| -Dtlogin*fr_CH.languageName: %|nls-666-##| -Dtlogin*fr_CH.437.languageName: %|nls-667-##| -Dtlogin*fr_CH.850.languageName: %|nls-668-##| -Dtlogin*is.languageName: %|nls-669-##| -Dtlogin*is_IS.850.languageName: %|nls-670-##| -Dtlogin*it.languageName: %|nls-671-##| -Dtlogin*it_IT.437.languageName: %|nls-672-##| -Dtlogin*it_IT.850.languageName: %|nls-673-##| -Dtlogin*it_CH.languageName: %|nls-674-##| -Dtlogin*it_CH.437.languageName: %|nls-675-##| -Dtlogin*it_CH.850.languageName: %|nls-676-##| -Dtlogin*ja.languageName: %|nls-677-##| -Dtlogin*ja_JP.EUC.languageName: %|nls-678-##| -Dtlogin*nl.languageName: %|nls-679-##| -Dtlogin*nl_NL.437.languageName: %|nls-680-##| -Dtlogin*nl_NL.850.languageName: %|nls-681-##| -Dtlogin*nl_BE.languageName: %|nls-682-##| -Dtlogin*nl_BE.437.languageName: %|nls-683-##| -Dtlogin*nl_BE.850.languageName: %|nls-684-##| -Dtlogin*no.languageName: %|nls-685-##| -Dtlogin*no_NO.850.languageName: %|nls-686-##| -Dtlogin*no_NO.865.languageName: %|nls-687-##| -Dtlogin*pt.languageName: %|nls-688-##| -Dtlogin*pt_BR.languageName: %|nls-689-##| -Dtlogin*pt_PT.850.languageName: %|nls-690-##| -Dtlogin*pt_PT.860.languageName: %|nls-691-##| -Dtlogin*sv.languageName: %|nls-692-##| -Dtlogin*sv_SE.437.languageName: %|nls-693-##| -Dtlogin*sv_SE.850.languageName: %|nls-694-##| - -#endif /* USL */ - - !!###################################################################### !! diff --git a/cde/programs/dtlogin/config/Xsession.src b/cde/programs/dtlogin/config/Xsession.src index 56059638..cc7ec430 100644 --- a/cde/programs/dtlogin/config/Xsession.src +++ b/cde/programs/dtlogin/config/Xsession.src @@ -357,7 +357,7 @@ XCOMM ########################################################################## dtdbcacherm="rm -f /tmp/dtdbcache_$DISPLAY" #endif dtstart_appgather="$DT_BINPATH/dtappgather &" -#if defined(USL) || defined(sun) +#if defined(sun) dtstart_dsdm="$DT_BINPATH/dsdm &" #endif @@ -564,7 +564,7 @@ StartFirst() tooltalk=$(GetFirst dtstart_ttsession) # get tooltalk client dtdbcache=$(GetFirst dtstart_dtdbcache) # get dtdbcache client -#if defined(USL) || defined(sun) +#if defined(sun) if [ -z "$SDT_NO_DSDM" ]; then StartFirst dtstart_dsdm # start drag and drop proxy fi diff --git a/cde/programs/dtlogin/config/_common.ksh.src b/cde/programs/dtlogin/config/_common.ksh.src index a5966f49..38095dcb 100644 --- a/cde/programs/dtlogin/config/_common.ksh.src +++ b/cde/programs/dtlogin/config/_common.ksh.src @@ -34,8 +34,6 @@ HASH #if defined (__osf__) || defined(__OpenBSD__) || defined(__NetBSD__) pexec=$(LC_TIME=C ps -p $PPID | awk 'NR==2 {print $5}') -#elif defined(USL) && (OSMAJORVERSION > 1) - pexec=$(LC_TIME=C ps -p $PPID | awk 'NR==2 {print $6}') #elif defined(linux) pexec=$(LC_TIME=C /bin/ps -p $PPID 2>/dev/null | awk 'NR==2 {print $4}') #elif defined(__FreeBSD__) diff --git a/cde/programs/dtlogin/dm.c b/cde/programs/dtlogin/dm.c index c088287f..5dd94244 100644 --- a/cde/programs/dtlogin/dm.c +++ b/cde/programs/dtlogin/dm.c @@ -85,18 +85,6 @@ #define sigmask(m) (1 << (( m-1))) #endif - -/*************************************************************************** - * - * External variable declarations - * - ***************************************************************************/ - -#if defined(USL) -extern int makepttypair (); -#endif - - /*************************************************************************** * * Local procedure declarations @@ -182,15 +170,6 @@ main( int argc, char **argv ) if ( (progName = malloc(strlen(argv[0]) + 1)) != NULL ) strcpy(progName, argv[0]); -#if defined(USL) - /* create master slave pair for use in login */ - if (makepttypair () < 0) - { - Debug ("Could not create pty for use in login"); - exit (1); - } -#endif - /* * Step 1 - load configuration parameters diff --git a/cde/programs/dtlogin/dm.h b/cde/programs/dtlogin/dm.h index ed5f8884..aefef37a 100644 --- a/cde/programs/dtlogin/dm.h +++ b/cde/programs/dtlogin/dm.h @@ -117,8 +117,6 @@ #define DEF_NLS_DIR "/usr/lib/nls/loc" #elif defined(hpV4) #define DEF_NLS_DIR "/usr/lib/nls/msg" -#elif defined(USL) - #define DEF_NLS_DIR "/usr/lib/locale" #else #define DEF_NLS_DIR CDE_INSTALLATION_TOP "/lib/nls/msg" #endif diff --git a/cde/programs/dtlogin/session.c b/cde/programs/dtlogin/session.c index 495db0cb..683726ab 100644 --- a/cde/programs/dtlogin/session.c +++ b/cde/programs/dtlogin/session.c @@ -1625,8 +1625,6 @@ StartClient( struct verify_info *verify, struct display *d, int *pidp ) failsafeArgv[i++] = "/usr/bin/X11/aixterm"; #elif defined(sun) failsafeArgv[i++] = "/usr/openwin/bin/xterm"; -#elif defined (USL) - failsafeArgv[i++] = "/usr/X/bin/xterm"; #elif defined(__hpux) failsafeArgv[i++] = "/usr/bin/X11/hpterm"; #elif defined(__OpenBSD__) diff --git a/cde/programs/dtlogin/sysauth.c b/cde/programs/dtlogin/sysauth.c index 700155e9..caf6679f 100644 --- a/cde/programs/dtlogin/sysauth.c +++ b/cde/programs/dtlogin/sysauth.c @@ -67,8 +67,7 @@ ** __apollo Domain OS only ** __hp_osf HP OSF/1 OS only ** sun SUN OS only - ** USL USL OS only - ** SVR4 SUN OS and USL + ** SVR4 SUN OS et al. ** _AIX AIX only ** _POWER AIX version 4 only ** @@ -109,10 +108,6 @@ #endif #endif -#if defined(USL) -#include -#endif - #include "dm.h" #include "vg.h" #include "vgmsg.h" @@ -124,8 +119,7 @@ #if !(defined(__hpux) || \ defined(__apollo) || \ defined(_AIX) || \ - defined(sun) || \ - defined(USL)) + defined(sun)) #define generic #endif @@ -1809,209 +1803,6 @@ tsm_check_login(uid_t uid) ***************************************************************************/ -#if defined(USL) -/*************************************************************************** - * - * Start authentication routines (USL) - * - ***************************************************************************/ - - -#define LOGIN_SUCCESS 0 -#define LOGIN_FAIL 1 -#define INACTIVE 2 -#define EXPIRED 3 -#define IDLEWEEKS 4 -#define MANDATORY 5 -#define AGED 6 -#define BADSHELL 7 -#define NOHOME 8 -#define PFLAG 11 - -/*************************************************************************** - * - * External declarations (USL) - * - ***************************************************************************/ - - - -/*************************************************************************** - * - * Procedure declarations (USL) - * - ***************************************************************************/ - - -static void Audit( struct passwd *p, char *msg, int errnum) ; -static int PasswordAged( register struct passwd *pw) ; -static void WriteBtmp( char *name) ; - - - -/*************************************************************************** - * - * Global variables (USL) - * - ***************************************************************************/ - -extern int Slaveptty_fd; - - -/*************************************************************************** - * - * Audit (USL) - * - ***************************************************************************/ - -static void -Audit( struct passwd *p, char *msg, int errnum ) -{ - - /* - * make sure program is back to super-user... - */ - - seteuid(0); - - return; -} - - - - -/*************************************************************************** - * - * WriteBtmp (USL) - * - * log bad login attempts - * - ***************************************************************************/ - -static void -WriteBtmp( char *name ) -{ - return; -} - - - - -/*************************************************************************** - * - * Authenticate (USL) - * - * verify the user - * - * return codes indicate authentication results. - ***************************************************************************/ - -#define MAXATTEMPTS 3 - -int -Authenticate( struct display *d, char *name, char *passwd, char **msg ) -{ - - int ret; - char **ava, *tty; - char *p; - char xlogname[137]; - char xpasswd[137]; - char xtty[137]; - - char *origpw; - - /* - * Nothing to do if no name provided. - */ - if (!name) - return(VF_INVALID); - - /* - * Save provided password. - */ - origpw = passwd; - if (!passwd) passwd = ""; - - /* - * Put the logname and the passwd on the ava stream - */ - if ((ret = dup2 (Slaveptty_fd, 0)) == -1) - Debug ("Problem with dup2\n"); - - ava = retava(Slaveptty_fd); - - (void) bzero (xlogname, strlen (xlogname)); - (void) sprintf (xlogname, "XLOGNAME=%s", name); - if ((ava = putava (xlogname, ava)) == NULL) - { - Debug ("Could not set logname ava\n"); - } - - (void) bzero (xpasswd, strlen (xpasswd)); - (void) sprintf (xpasswd, "XPASSWD=%s", passwd); - if ((ava = putava (xpasswd, ava)) == NULL) - { - Debug ("Could not set passwd ava\n"); - } - - (void) bzero (xtty, strlen (xtty)); - (void) sprintf (xtty, "XTTY=%s", ttyname(Slaveptty_fd)); - if ((ava = putava (xtty, ava)) == NULL) - { - Debug ("Could not set tty ava\n"); - } - - if (setava (Slaveptty_fd, ava) != 0) - { - Debug ("Could not do setava\n"); - } - - /* - * invoke identification and authorizarion scheme - */ - - switch (ret = invoke (Slaveptty_fd, "login")) - { - - case LOGIN_SUCCESS: - Audit(p, " Successful login", 0); - return(VF_OK); - case LOGIN_FAIL: - return(origpw ? VF_INVALID : VF_CHALLENGE); - - /* The next three cases need to define special return values */ - /* for the aged passwords and accounts. */ - - case INACTIVE: - case IDLEWEEKS: - /* PasswdAged (linfo); */ - return(VF_PASSWD_AGED); - case EXPIRED: /* SS */ - /* AccountAged (linfo); */ - return(VF_PASSWD_AGED); - - /* These 3 cases should allow user to select a new password */ - /* after displaying a warning, but current implementation */ - /* only displays the warning. */ - - case MANDATORY: - case PFLAG: - case AGED: - return(VF_PASSWD_AGED); - default: - return(VF_INVALID); /* SS */ - } -} - - -/*************************************************************************** - * - * End authentication routines (USL) - * - ***************************************************************************/ -#endif /* USL */ - #ifdef generic /*************************************************************************** * diff --git a/cde/programs/dtlogin/usl_ptty.c b/cde/programs/dtlogin/usl_ptty.c deleted file mode 100644 index 6b656a1c..00000000 --- a/cde/programs/dtlogin/usl_ptty.c +++ /dev/null @@ -1,160 +0,0 @@ -/* - * CDE - Common Desktop Environment - * - * Copyright (c) 1993-2012, The Open Group. All rights reserved. - * - * These libraries and programs are free software; you can - * redistribute them and/or modify them under the terms of the GNU - * Lesser General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) - * any later version. - * - * These libraries and programs are distributed in the hope that - * they will be useful, but WITHOUT ANY WARRANTY; without even the - * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU Lesser General Public License for more - * details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with these libraries and programs; if not, write - * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth - * Floor, Boston, MA 02110-1301 USA - */ -/* $XConsortium: usl_ptty.c /main/3 1995/10/27 16:16:16 rswiston $ */ -/* * - * (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. * - */ -/* usl_ptty.c: routines to perform USL's password authentication */ - -#include /* just so file isn't empty */ - -#if defined (USL) - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - - -/* system calls */ - -extern int close(); -extern int ioctl(); -extern int getmsg(); - - -/* externally defined routines */ - -extern int grantpt(); -extern int unlockpt(); -extern char *ptsname(); -extern char *strncpy(); - - - -/* externally defined global variables */ - -int Termios_received = 0; /* received termios structure flag */ -struct termios Termios; /* termios buffer */ - -#define RX_SLAVENAMELEN 32 - - -/* locally defined global variables */ - -int Ptty_open; /* ptty open flag */ -int Ptty_fd; /* master ptty fd */ -int Slaveptty_fd; /* slave ptty fd */ -char Slaveptty_name[RX_SLAVENAMELEN]; /* slave ptty device file name */ - - -/* - * makepttypair() - * - * This function creates and opens a master/slave pair of pseudo ttys. - * It returns 0 for success, -1 for failure - * - */ - -int -makepttypair() -{ - char *ttyname; /* file name of slave pseudo tty */ - pid_t mypid = getpid(); /* my process id */ - struct passwd *pwp; /* password file entry */ - - Debug("makettypair\n"); - if ((Ptty_fd = open("/dev/ptmx", O_RDWR)) == -1) { - Debug ("ptty: open ptmx failed, errno = %d\n", errno); - return(-1); - } - if (grantpt(Ptty_fd) == -1) { - Debug ("ptty: grantpt failed\n"); - return(-1); - } - if (unlockpt(Ptty_fd) == -1) { - Debug ("ptty: unlockpt failed\n"); - return(-1); - } - if ((ttyname = ptsname(Ptty_fd)) == NULL) { - Debug ("ptty: ptsname failed\n"); - return(-1); - } - (void) strncpy(Slaveptty_name, ttyname, RX_SLAVENAMELEN); - if ((Slaveptty_fd = open(Slaveptty_name, O_RDWR)) == -1) { - Debug ("ptty: could not open pts %s, errno = %d\n", - Slaveptty_name, errno); - return(-1); - } - - if (ioctl(Slaveptty_fd, I_PUSH, "ptem") == -1) { - Debug ("ptty: push ptem failed\n"); - return(-1); - } - if (ioctl(Slaveptty_fd, I_PUSH, "ldterm") == -1) { - Debug ("ptty: push ldterm failed\n"); - return(-1); - } - - /* - * Note that since the following ioctl() is performed - * before the pckt module is pushed, it will not be sent back - * to the client. This is what we want. - * - */ - - if (Termios_received) - if (ioctl(Slaveptty_fd, TCSETS, &Termios) == -1) { - Debug ("ptty: TCSETS failed\n"); - return(-1); - } - - if (ioctl(Ptty_fd, I_PUSH, "pckt") == -1) { - Debug ("ptty: push pckt failed\n"); - return(-1); - } - - /* disable ldterm input processing on server end */ - if (ioctl(Ptty_fd, TIOCREMOTE, 1) == -1) { - Debug ("ptty: ioctl(TIOCREMOTE) failed\n"); - return(-1); - } - - Ptty_open = 1; - - Debug ("ptty: pttys created\n"); - - return(0); -} - -#endif /* USL */ diff --git a/cde/programs/dtlogin/util.c b/cde/programs/dtlogin/util.c index a3af7ee1..b7939698 100644 --- a/cde/programs/dtlogin/util.c +++ b/cde/programs/dtlogin/util.c @@ -349,9 +349,7 @@ CleanUpChild( void ) sigsetmask(0); #else #if defined (SYSV) || defined (SVR4) || defined(linux) -#if !defined (USL) setpgrp (); -#endif /* USL */ #else setpgrp (0, getpid ()); sigsetmask (0); @@ -951,83 +949,7 @@ ScanNLSDir(char *dirname) } #endif /* __osf__obsoleted__ */ -#elif defined(USL) - -#define LC_COLLATE "LC_COLLATE" -#define LC_CTYPE "LC_CTYPE" -#define LC_MESSAGES "LC_MESSAGES" -#define LC_MONETARY "LC_MONETARY" -#define LC_NUMERIC "LC_NUMERIC" -#define LC_TIME "LC_TIME" - -/* - * Scan for installed locales on Novell/SCO platforms. - */ -{ - DIR *nls_dirp, *locale_dirp; - struct dirent *dp; - char* locale; - char locale_path[MAXPATHLEN]; - struct stat locale_stat; - int retval; - - /* - * To determin the fully installed locale list, check several locations. - */ - if((nls_dirp = opendir(dirname)) != NULL) - { - while((dp = readdir(nls_dirp)) != NULL) - { - int is_locale = 0; - - locale = dp->d_name; - - /* - * A locale is indicated by a directory which has one or more - * of the following subdirectories: - * LC_COLLATE - * LC_CTYPE - * LC_MESSAGES - * LC_MONETARY - * LC_NUMERIC - * LC_TIME - */ - (void) sprintf(locale_path, "%s/%s", dirname, locale); - retval = stat(locale_path, &locale_stat); - if ( (0 != retval) || (! S_ISDIR(locale_stat.st_mode)) ) - continue; - - if (NULL == (locale_dirp = opendir(locale_path)) ) - continue; - - is_locale = FALSE; - while (NULL != (dp = readdir(locale_dirp)) && - FALSE == is_locale) - { - if ((0 == strcmp(dp->d_name, LC_COLLATE)) || - (0 == strcmp(dp->d_name, LC_CTYPE)) || - (0 == strcmp(dp->d_name, LC_MESSAGES)) || - (0 == strcmp(dp->d_name, LC_MONETARY)) || - (0 == strcmp(dp->d_name, LC_NUMERIC)) || - (0 == strcmp(dp->d_name, LC_TIME)) ) - is_locale = 1; - } - - closedir(locale_dirp); - - if (is_locale && - LANGLISTSIZE > (int) (strlen(languageList)+strlen(locale)+2) ) - { - strcat(languageList, " "); - strcat(languageList, locale); - } - } - - closedir(nls_dirp); - } -} - -#else /* !_AIX && !hpV4 && !__osf__ !sun && !USL */ +#else /* !_AIX && !hpV4 && !__osf__ !sun */ /* * Scan for installed locales on generic platform */ diff --git a/cde/programs/dtlogin/vgauth.c b/cde/programs/dtlogin/vgauth.c index 7f0332b5..265a4162 100644 --- a/cde/programs/dtlogin/vgauth.c +++ b/cde/programs/dtlogin/vgauth.c @@ -67,8 +67,7 @@ ** __apollo Domain OS only ** __hp_osf HP OSF/1 OS only ** sun SUN OS only - ** USL USL OS only - ** SVR4 SUN OS and USL + ** SVR4 SUN OS et al. ** _AIX AIX only ** **************************************************************************** diff --git a/cde/programs/dtmail/MotifApp/Application.C b/cde/programs/dtmail/MotifApp/Application.C index 85f1e87f..d70f9b30 100644 --- a/cde/programs/dtmail/MotifApp/Application.C +++ b/cde/programs/dtmail/MotifApp/Application.C @@ -254,7 +254,7 @@ Application::~Application() delete []_windows; #ifdef CDExc21492 - #if defined(__hpux) || defined(USL) + #if defined(__hpux) this->BasicComponent::~BasicComponent(); #elif __osf__ BasicComponent * The_End = this; diff --git a/cde/programs/dtmail/dtmail/AttachArea.C b/cde/programs/dtmail/dtmail/AttachArea.C index f1e8d0de..e03e2b65 100644 --- a/cde/programs/dtmail/dtmail/AttachArea.C +++ b/cde/programs/dtmail/dtmail/AttachArea.C @@ -47,9 +47,6 @@ #include #include #include -#if defined(USL) -#define S_ISSOCK(mode) ((mode & S_IFMT) == S_IFSOCK) -#endif #include #include
#include diff --git a/cde/programs/dtmail/dtmail/AttachCmds.C b/cde/programs/dtmail/dtmail/AttachCmds.C index 65b5e052..34ff2ec1 100644 --- a/cde/programs/dtmail/dtmail/AttachCmds.C +++ b/cde/programs/dtmail/dtmail/AttachCmds.C @@ -47,9 +47,6 @@ #include #include #include -#if defined(USL) -#define S_ISSOCK(mode) ((mode & S_IFMT) == S_IFSOCK) -#endif #include #include #include diff --git a/cde/programs/dtmail/dtmail/DmxMessage.C b/cde/programs/dtmail/dtmail/DmxMessage.C index 51c44943..252022bc 100644 --- a/cde/programs/dtmail/dtmail/DmxMessage.C +++ b/cde/programs/dtmail/dtmail/DmxMessage.C @@ -74,11 +74,7 @@ // For CHARSET #include #include -#if !defined(USL) #include -#else -#include -#endif #include "Application.h" #include "DtMail/DtMail.hh" diff --git a/cde/programs/dtmail/dtmail/MsgHndArray.hh b/cde/programs/dtmail/dtmail/MsgHndArray.hh index e5c1605e..c0a28633 100644 --- a/cde/programs/dtmail/dtmail/MsgHndArray.hh +++ b/cde/programs/dtmail/dtmail/MsgHndArray.hh @@ -45,12 +45,6 @@ #include #include -#if defined(USL) && (OSMAJORVERSION == 2) -extern "C" { -#endif -#if defined(USL) && (OSMAJORVERSION == 2) -}; -#endif #include class MsgStruct { diff --git a/cde/programs/dtmail/dtmail/RoamApp.C b/cde/programs/dtmail/dtmail/RoamApp.C index ab47b1c0..dc474835 100644 --- a/cde/programs/dtmail/dtmail/RoamApp.C +++ b/cde/programs/dtmail/dtmail/RoamApp.C @@ -70,9 +70,9 @@ #include #include -#if defined(USL) || defined(linux) || defined(CSRG_BASED) +#if defined(linux) || defined(CSRG_BASED) #define wcswcs wcsstr -#include // iswspace is defined in this header on USL */ +#include #endif #ifdef DTMAIL_TOOLTALK @@ -957,7 +957,7 @@ Usage(char *progname) nl_catd DT_catd = (nl_catd) -1; // catgets file descriptor -#if defined(reallyoldsun) || defined(USL) +#if defined(reallyoldsun) #define SA_HANDLER_TYPE void (*)(void) #else #define SA_HANDLER_TYPE void (*)(int) diff --git a/cde/programs/dtmail/dtmail/RoamMenuWindow.C b/cde/programs/dtmail/dtmail/RoamMenuWindow.C index 30f0a8a8..75764df9 100644 --- a/cde/programs/dtmail/dtmail/RoamMenuWindow.C +++ b/cde/programs/dtmail/dtmail/RoamMenuWindow.C @@ -72,9 +72,7 @@ #include #include -#if !defined(USL) #include -#endif #include #include #include diff --git a/cde/programs/dtmail/dtmailpr/dmx.hh b/cde/programs/dtmail/dtmailpr/dmx.hh index 133e957a..1baca99f 100644 --- a/cde/programs/dtmail/dtmailpr/dmx.hh +++ b/cde/programs/dtmail/dtmailpr/dmx.hh @@ -96,7 +96,7 @@ enum DmxHeaders }; // This is undoubtedly illegal, unethical, and immoral. So sue me. -#if !defined(SunOS) && !defined(USL) && !defined(_AIX) +#if !defined(SunOS) && !defined(_AIX) #undef boolean_t typedef enum { B_FALSE, B_TRUE } boolean_t; #endif // SunOS diff --git a/cde/programs/dtmail/dtmailpr/message.C b/cde/programs/dtmail/dtmailpr/message.C index 3aa93193..059f6b10 100644 --- a/cde/programs/dtmail/dtmailpr/message.C +++ b/cde/programs/dtmail/dtmailpr/message.C @@ -51,11 +51,7 @@ // For CHARSET #include #include -#if !defined(USL) #include -#else -#include -#endif #include "utils/str_utils.h" diff --git a/cde/programs/dtmail/libDtMail/Common/Buffer.C b/cde/programs/dtmail/libDtMail/Common/Buffer.C index e06b0a4f..f258ab12 100644 --- a/cde/programs/dtmail/libDtMail/Common/Buffer.C +++ b/cde/programs/dtmail/libDtMail/Common/Buffer.C @@ -46,13 +46,6 @@ #include #ifdef __osf__ #include -#else -#if defined(USL) && (OSMAJORVERSION == 2) -extern "C" { -#endif -#if defined(USL) && (OSMAJORVERSION == 2) -}; -#endif #endif // __osf__ #include #include diff --git a/cde/programs/dtmail/libDtMail/Common/DtMailRc.C b/cde/programs/dtmail/libDtMail/Common/DtMailRc.C index dab0b9eb..8865e8cc 100644 --- a/cde/programs/dtmail/libDtMail/Common/DtMailRc.C +++ b/cde/programs/dtmail/libDtMail/Common/DtMailRc.C @@ -152,7 +152,7 @@ struct cmd cmdtab[] = { #define SYSTEM_MAILRC "/etc/mail/mail.rc" #elif defined(_AIX) || defined(__osf__) || defined(linux) #define SYSTEM_MAILRC "/usr/share/lib/Mail.rc" -#elif defined(USL) || defined(__hpux) +#elif defined(__hpux) #define SYSTEM_MAILRC "/usr/share/lib/mailx.rc" #elif defined(CSRG_BASED) #define SYSTEM_MAILRC "/etc/mail.rc" diff --git a/cde/programs/dtmail/libDtMail/Common/DtMailServer.C b/cde/programs/dtmail/libDtMail/Common/DtMailServer.C index 7b819cdc..2b1c9ea0 100644 --- a/cde/programs/dtmail/libDtMail/Common/DtMailServer.C +++ b/cde/programs/dtmail/libDtMail/Common/DtMailServer.C @@ -160,7 +160,7 @@ DtMailServer::set_password(char *password) // // len - Length of message. // -#if defined(reallyoldsun) || defined(USL) +#if defined(reallyoldsun) #define SA_HANDLER_TYPE void (*)(void) #else #define SA_HANDLER_TYPE void (*)(int) diff --git a/cde/programs/dtmail/libDtMail/Common/Process.C b/cde/programs/dtmail/libDtMail/Common/Process.C index a02c5732..1ded59f6 100644 --- a/cde/programs/dtmail/libDtMail/Common/Process.C +++ b/cde/programs/dtmail/libDtMail/Common/Process.C @@ -51,7 +51,7 @@ /* ** file included for INFTIM */ -#if defined(SunOS) || defined(USL) +#if defined(SunOS) #include #elif defined(HPUX) #include diff --git a/cde/programs/dtmail/libDtMail/Common/Session.C b/cde/programs/dtmail/libDtMail/Common/Session.C index b18ae69e..31f200cd 100644 --- a/cde/programs/dtmail/libDtMail/Common/Session.C +++ b/cde/programs/dtmail/libDtMail/Common/Session.C @@ -86,12 +86,6 @@ #include #include -#if defined(USL) && (OSMAJORVERSION == 2) -extern "C" { -#endif -#if defined(USL) && (OSMAJORVERSION == 2) -}; -#endif #include #include #include diff --git a/cde/programs/dtmail/libDtMail/RFC/RFCMailBox.C b/cde/programs/dtmail/libDtMail/RFC/RFCMailBox.C index 1a09b1cf..423b64ad 100644 --- a/cde/programs/dtmail/libDtMail/RFC/RFCMailBox.C +++ b/cde/programs/dtmail/libDtMail/RFC/RFCMailBox.C @@ -103,7 +103,7 @@ extern "C" { #define MAIL_SPOOL_PATH "/var/mail/%s" #endif -#if defined(sun) || defined(USL) +#if defined(sun) #define LCL_SIG_HANDLER_SIGNATURE #elif defined(__hpux) #define LCL_SIG_HANDLER_SIGNATURE __harg @@ -570,7 +570,7 @@ RFCMailBox::alterPageMappingAdvice(MapRegion *map, int advice) for (int m = 0; m < me; m++) { MapRegion *map_t = _mappings[m]; -#if !defined(USL) && !defined(linux) && !defined(sun) +#if !defined(linux) && !defined(sun) // no madvise on these systems if (map_t == map || map == (MapRegion *)-1) madvise(map_t->map_region, (size_t) map_t->map_size, advice); @@ -889,7 +889,7 @@ RFCMailBox::open(DtMailEnv & error, // five characters are "From " char inbuf[6]; -#if defined(sun) || defined(USL) +#if defined(sun) pread(_fd, (void *)inbuf, 5, 0); #else lseek(_fd, (off_t) 0L, SEEK_SET); @@ -2259,7 +2259,7 @@ RFCMailBox::parseFile(DtMailEnv & error, int map_slot) // unsigned long pagelimit = _mappings[map_slot]->map_size; -#if !defined(USL) && !defined(linux) && !defined(sun) +#if !defined(linux) && !defined(sun) // no madvise; dont use optimization madvise( (char *)_mappings[map_slot]->map_region, @@ -2350,7 +2350,7 @@ RFCMailBox::parseFile(DtMailEnv & error, int map_slot) // At this point we most likely will see random behavior. We will // tell the kernel to pull in the minimum number of extra pages. // -#if !defined(USL) && !defined(linux) && !defined(sun) +#if !defined(linux) && !defined(sun) // no madvise; dont use optimization madvise( (char *)_mappings[map_slot]->map_region, @@ -4539,7 +4539,7 @@ RFCMailBox::startAutoSave(DtMailEnv & error, _session->removeEventRoutine(error, PollEntry, this); } -#if defined(reallyoldsun) || defined(USL) +#if defined(reallyoldsun) #define SA_HANDLER_TYPE void (*)(void) #else #define SA_HANDLER_TYPE void (*)(int) diff --git a/cde/programs/dtmail/libDtMail/RFC/RFCMailValues.C b/cde/programs/dtmail/libDtMail/RFC/RFCMailValues.C index 92feec65..5c4681da 100644 --- a/cde/programs/dtmail/libDtMail/RFC/RFCMailValues.C +++ b/cde/programs/dtmail/libDtMail/RFC/RFCMailValues.C @@ -47,9 +47,7 @@ #include #include #include -#if !defined(USL) #include -#endif #include #include diff --git a/cde/programs/dtmail/libDtMail/RFC/RFCTransport.C b/cde/programs/dtmail/libDtMail/RFC/RFCTransport.C index 6fae17c8..5e9e2488 100644 --- a/cde/programs/dtmail/libDtMail/RFC/RFCTransport.C +++ b/cde/programs/dtmail/libDtMail/RFC/RFCTransport.C @@ -741,9 +741,7 @@ RFCTransport::launchSendmail(DtMailEnv & error, const char * mailer; _session->mailRc(error)->getValue(error, "sendmail", &mailer); if (error.isSet()) { -#if defined(USL) - mailer = "/usr/ucblib/sendmail"; -#elif defined(__OpenBSD__) +#if defined(__OpenBSD__) mailer = "/usr/sbin/sendmail"; #else mailer = "/usr/lib/sendmail"; diff --git a/cde/programs/dtmail/libDtMail/RFC/SunV3.C b/cde/programs/dtmail/libDtMail/RFC/SunV3.C index 18c901af..e35d3d14 100644 --- a/cde/programs/dtmail/libDtMail/RFC/SunV3.C +++ b/cde/programs/dtmail/libDtMail/RFC/SunV3.C @@ -55,7 +55,7 @@ /* ** file included for INFTIM */ -#if defined(SunOS) || defined (USL) +#if defined(SunOS) #include #elif defined(HPUX) #include diff --git a/cde/programs/dtprintinfo/DtPrintinfo.C b/cde/programs/dtprintinfo/DtPrintinfo.C index fbc88437..dbc12fb0 100644 --- a/cde/programs/dtprintinfo/DtPrintinfo.C +++ b/cde/programs/dtprintinfo/DtPrintinfo.C @@ -45,7 +45,7 @@ nl_catd dtprintinfo_cat = NULL; #include #include -#if defined(aix) || defined(USL) +#if defined(aix) extern "C" { extern int seteuid(uid_t); } #endif diff --git a/cde/programs/dtprintinfo/Imakefile b/cde/programs/dtprintinfo/Imakefile index 800060e1..3e781298 100644 --- a/cde/programs/dtprintinfo/Imakefile +++ b/cde/programs/dtprintinfo/Imakefile @@ -55,10 +55,6 @@ AWK = nawk DEFINES = -DHAS_EXCEPTIONS #endif -#ifdef USLArchitecture -AWK = nawk -#endif - #ifdef AlphaArchitecture DEFINES = -D_TOOLTALK #endif diff --git a/cde/programs/dtprintinfo/dtprintinfomsg.h b/cde/programs/dtprintinfo/dtprintinfomsg.h index c9e9c7ce..9769efa3 100644 --- a/cde/programs/dtprintinfo/dtprintinfomsg.h +++ b/cde/programs/dtprintinfo/dtprintinfomsg.h @@ -24,7 +24,6 @@ #ifndef DTPRINTINFOMSG_H #define DTPRINTINFOMSG_H -#if !defined(USL) /* * if __cplusplus is defined, the system header files take care * of themselves and putting this "extern C" here causes inconsistent linkage @@ -33,17 +32,10 @@ #ifdef __cplusplus extern "C" { #endif -#endif /* ! USL */ #include #include -#if defined(USL) -#ifdef __cplusplus -extern "C" { -#endif -#endif /* USL */ - #include "dtprintinfo_msg.h" #include "dtprintinfo_cat.h" diff --git a/cde/programs/dtprintinfo/libUI/BaseUI.C b/cde/programs/dtprintinfo/libUI/BaseUI.C index 3a4618a3..8de13e1e 100644 --- a/cde/programs/dtprintinfo/libUI/BaseUI.C +++ b/cde/programs/dtprintinfo/libUI/BaseUI.C @@ -44,7 +44,7 @@ #include #ifdef hpux #include -#elif defined(USL) || defined(__osf__) || defined(linux) +#elif defined(__osf__) || defined(linux) #include #else #include @@ -53,7 +53,7 @@ #include /* need to get bzero defined */ #endif /* _AIX */ -#if defined(aix) || defined(USL) +#if defined(aix) extern "C" { extern int strcasecmp(const char *, const char *); diff --git a/cde/programs/dtprintinfo/libUI/BaseUI.h b/cde/programs/dtprintinfo/libUI/BaseUI.h index f34ae61a..5f91681e 100644 --- a/cde/programs/dtprintinfo/libUI/BaseUI.h +++ b/cde/programs/dtprintinfo/libUI/BaseUI.h @@ -35,7 +35,7 @@ #ifndef _BOOLEAN_ #define _BOOLEAN_ -#if (defined(sun) && OSMAJORVERSION <= 5 && OSMINORVERSION <= 3)|| defined(USL) +#if (defined(sun) && OSMAJORVERSION <= 5 && OSMINORVERSION <= 3) #include #define boolean boolean_t #define true B_TRUE diff --git a/cde/programs/dtprintinfo/libUI/MotifUI/ComboBoxObj.C b/cde/programs/dtprintinfo/libUI/MotifUI/ComboBoxObj.C index 9bbf2aeb..1151ff9d 100644 --- a/cde/programs/dtprintinfo/libUI/MotifUI/ComboBoxObj.C +++ b/cde/programs/dtprintinfo/libUI/MotifUI/ComboBoxObj.C @@ -35,12 +35,7 @@ #include #include -ComboBoxObj::ComboBoxObj(MotifUI *parent, -#if defined(USL) - void (*callback)(ComboBoxObj *, char *, int), -#else - ComboBoxCallback callback, -#endif +ComboBoxObj::ComboBoxObj(MotifUI *parent, ComboBoxCallback callback, char *name, char **items, int n_items) diff --git a/cde/programs/dtprintinfo/libUI/MotifUI/ComboBoxObj.h b/cde/programs/dtprintinfo/libUI/MotifUI/ComboBoxObj.h index 48c0af97..9ed7e052 100644 --- a/cde/programs/dtprintinfo/libUI/MotifUI/ComboBoxObj.h +++ b/cde/programs/dtprintinfo/libUI/MotifUI/ComboBoxObj.h @@ -52,13 +52,8 @@ class ComboBoxObj : public MotifUI { public: -#if defined(USL) - ComboBoxObj(MotifUI * parent, void (*)(ComboBoxObj *, char *, int), - char *name, char **items, int n_items); -#else ComboBoxObj(MotifUI * parent, ComboBoxCallback, char *name, char **items, int n_items); -#endif void Add(char *item); void Delete(char *item); diff --git a/cde/programs/dtprintinfo/libUI/MotifUI/MotifUI.h b/cde/programs/dtprintinfo/libUI/MotifUI/MotifUI.h index a067d1d1..90cf92be 100644 --- a/cde/programs/dtprintinfo/libUI/MotifUI/MotifUI.h +++ b/cde/programs/dtprintinfo/libUI/MotifUI/MotifUI.h @@ -33,10 +33,6 @@ #include -#if defined(USL) -#undef STRDUP /* get rid of memutil.h definition. Use def in BaseUI.h. */ -#endif - #include "BaseUI.h" #include "MotifThread.h" diff --git a/cde/programs/dtprintinfo/objects/BaseObj.h b/cde/programs/dtprintinfo/objects/BaseObj.h index 45b47216..2ad8c1ec 100644 --- a/cde/programs/dtprintinfo/objects/BaseObj.h +++ b/cde/programs/dtprintinfo/objects/BaseObj.h @@ -36,7 +36,7 @@ #ifndef _BOOLEAN_ #define _BOOLEAN_ -#if (defined(sun) && OSMAJORVERSION <= 5 && OSMINORVERSION <= 3)|| defined(USL) +#if (defined(sun) && OSMAJORVERSION <= 5 && OSMINORVERSION <= 3) #include #define boolean boolean_t #define true B_TRUE diff --git a/cde/programs/dtprintinfo/objects/PrintObj/ParseJobs.C b/cde/programs/dtprintinfo/objects/PrintObj/ParseJobs.C index be91d8eb..a7d8b0ef 100644 --- a/cde/programs/dtprintinfo/objects/PrintObj/ParseJobs.C +++ b/cde/programs/dtprintinfo/objects/PrintObj/ParseJobs.C @@ -64,14 +64,14 @@ extern "C" in_addr_t inet_addr(const char *); #include #endif -#if defined(aix) || defined(__osf__) || defined(USL) +#if defined(aix) || defined(__osf__) extern "C" { int rresvport(int *); } #endif #ifdef hpux #define SETEUID(id) setresuid(getuid(), (uid_t)id, (uid_t)0); #else - #if defined(aix) || defined(USL) + #if defined(aix) extern "C" { extern int seteuid(uid_t); } #endif #define SETEUID(id) seteuid((uid_t)id) @@ -177,15 +177,9 @@ int ConnectToPrintServer(const char *rhost, int timeout) int s, lport = IPPORT_RESERVED - 1; // Get the host address and port number to connect to. -#if defined(USL) && OSMAJORVERSION > 1 - if (!(hp = gethostbyname((char *) rhost))) - { - unsigned long tmpaddr = inet_addr((char *) rhost); -#else if (!(hp = gethostbyname(rhost))) { unsigned long tmpaddr = inet_addr(rhost); -#endif hp = gethostbyaddr((char *)&tmpaddr, sizeof(tmpaddr), AF_INET); } if (hp == NULL) @@ -338,7 +332,7 @@ void LocalPrintJobs(char *printer, char **job_list, int *n_jobs) } #endif -#if defined(sun) || defined(USL) +#if defined(sun) // SUN LOCAL PARSER, actually this gets the local information from the file // system, it should have the good performance since no processes (lpstat) @@ -672,7 +666,7 @@ static int SortJobs(const void *_first, const void *_second) return (int)((**first).secs - (**second).secs); } -#endif // SUN and USL LOCAL PARSER +#endif // SUN LOCAL PARSER #ifdef hpux diff --git a/cde/programs/dtprintinfo/util/Invoke.C b/cde/programs/dtprintinfo/util/Invoke.C index 9369b8dd..41ff1e0a 100644 --- a/cde/programs/dtprintinfo/util/Invoke.C +++ b/cde/programs/dtprintinfo/util/Invoke.C @@ -116,8 +116,7 @@ Invoke::Invoke(const char *command, // Command to Run #if defined(__OSF1__) || defined(__osf__) action.sa_handler = (void (*)(int))SIG_IGN; -#elif defined(USL) || \ - ( defined(sun) && OSMAJORVERSION == 5 && OSMINORVERSION <= 4) +#elif (defined(sun) && OSMAJORVERSION == 5 && OSMINORVERSION <= 4) action.sa_handler = (void (*)())SIG_IGN; #else action.sa_handler = SIG_IGN; diff --git a/cde/programs/dtscreen/Imakefile b/cde/programs/dtscreen/Imakefile index f4ac14c9..8c130837 100644 --- a/cde/programs/dtscreen/Imakefile +++ b/cde/programs/dtscreen/Imakefile @@ -6,11 +6,6 @@ XCOMM $XConsortium: Imakefile /main/10 1996/10/09 14:06:18 drk $ LOCAL_LIBRARIES = $(DTSVCLIB) $(TTLIB) $(XMLIB) $(XTOOLLIB) $(XLIB) SYS_LIBRARIES = -lm $(DYNLIBSYSLIB) $(REGEXSYSLIB) - -#if defined(SCOArchitecture) - SYS_LIBRARIES = -lm -lcrypt -#endif - SRCS = blank.c dtscreen.c flame.c hopalong.c \ hsbramp.c image.c life.c pyro.c \ qix.c resource.c rotor.c swarm.c \ diff --git a/cde/programs/dtsearchpath/libCliSrv/UnixEnv.C b/cde/programs/dtsearchpath/libCliSrv/UnixEnv.C index b47c842e..97312450 100644 --- a/cde/programs/dtsearchpath/libCliSrv/UnixEnv.C +++ b/cde/programs/dtsearchpath/libCliSrv/UnixEnv.C @@ -32,9 +32,6 @@ #include "Environ.h" #include "DirIterator.h" #include -#if defined(USL) -#define S_ISLNK(mode) ((mode & S_IFMT) == S_IFLNK) -#endif #include #include #if defined(linux) || defined(CSRG_BASED) || defined(sun) @@ -46,14 +43,14 @@ #include #include #include -#if defined(sun) || defined(USL) +#if defined(sun) #include #else #include #endif #include -#if defined(sun) || defined(_AIX) || defined(__osf__) || defined(USL) || defined(linux) || defined(CSRG_BASED) +#if defined(sun) || defined(_AIX) || defined(__osf__) || defined(linux) || defined(CSRG_BASED) #define UID_NO_CHANGE ((uid_t) -1) #define GID_NO_CHANGE ((gid_t) -1) #endif @@ -62,7 +59,7 @@ UnixEnvironment::UnixEnvironment() { dtMountPoint = getEnvironmentVariable("DTMOUNTPOINT"); if (dtMountPoint.isNull()) -#if defined(sun) || defined(USL) +#if defined(sun) dtMountPoint = "/net/"; #else dtMountPoint = "/nfs/"; @@ -70,7 +67,7 @@ UnixEnvironment::UnixEnvironment() CString temp = getEnvironmentVariable("MANPATH"); if (temp.isNull()) -#if defined(sun) || defined(USL) +#if defined(sun) manpath = "/usr/share/man"; #elif defined(_AIX) manpath = "/usr/share/man:/usr/lpp/info"; @@ -308,15 +305,9 @@ char buffer[100]; struct dirent * direntry; while (direntry = dir()) { /*# ifdef should_be_sun_but_this_dont_work*/ -#if defined(USL) - char * re = NULL; - re = compile (filespec.data(), NULL, NULL); - if (step (direntry->d_name,re)) { -# else regex_t re; regcomp (&re, filespec.data(), 0); if (regexec (&re, direntry->d_name, 0, NULL, 0) == 0) { -# endif if (strcmp(direntry->d_name,".") == 0 || strcmp(direntry->d_name,"..") == 0) continue; diff --git a/cde/programs/dtsession/Imakefile b/cde/programs/dtsession/Imakefile index da7811cc..62f60c0b 100644 --- a/cde/programs/dtsession/Imakefile +++ b/cde/programs/dtsession/Imakefile @@ -44,10 +44,6 @@ EXTRA_OBJS = $(ALTDIRECTORY)SmMigResources.o #endif #endif -#if defined(SCOArchitecture) -SYS_LIBRARIES = -lcrypt -lm -#endif - #if defined(SunArchitecture) EXTRA_SRC = OWsync.c EXTRA_OBJS = $(ALTDIRECTORY)OWsync.o @@ -55,16 +51,6 @@ EXTRA_DEFINES = -D${PROGRAMS} SYS_LIBRARIES = -lelf -lm -ldl #endif -#if defined(USLArchitecture) -/* not needed for archive. usl shared libs must resolve every - * reference whether used or not. - */ -SYS_LIBRARIES = -lelf -lm -ldl -lgen -liaf -PROTO_DEFINES = -DEFINES = -DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\" \ - -DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\" -#endif - #if defined(LinuxArchitecture) EXTRA_DEFINES = -D${PROGRAMS} $(XINOPT) -DUSE_X11SSEXT SYS_LIBRARIES = $(XINLIB) $(TIRPCLIB) -lXss -ldl -lcrypt -lm diff --git a/cde/programs/dtsession/SmConMgmt.c b/cde/programs/dtsession/SmConMgmt.c index 17d51aa8..e752252f 100644 --- a/cde/programs/dtsession/SmConMgmt.c +++ b/cde/programs/dtsession/SmConMgmt.c @@ -163,7 +163,7 @@ GetMemoryUtilization(void) #if !defined(linux) static int init = 0; static int kmem; -#if !defined(SVR4) && !defined(sco) && !defined(hpV4) && !defined(_POWER) && !defined (__osf__) && !defined(CSRG_BASED) +#if !defined(SVR4) && !defined(hpV4) && !defined(_POWER) && !defined (__osf__) && !defined(CSRG_BASED) extern void nlist(); #endif int i; diff --git a/cde/programs/dtsession/SmLock.c b/cde/programs/dtsession/SmLock.c index 57de2055..1d378b7a 100644 --- a/cde/programs/dtsession/SmLock.c +++ b/cde/programs/dtsession/SmLock.c @@ -74,14 +74,8 @@ #include
#include #ifdef SVR4 -# ifdef USL -# include -# include -# include -# else # include #endif -#endif #if defined(linux) # include @@ -1770,12 +1764,7 @@ localAuthenticate( #ifdef SVR4 -# ifdef USL - uinfo_t uinfo; - char *upasswd, *newname = NULL; -# else struct spwd *sp=NULL; -# endif #endif if(smGD.secureSystem) @@ -1792,20 +1781,12 @@ localAuthenticate( pwent = getpwuid(uid); if (pwent != NULL) { -# ifdef USL - name = newname = strdup(pwent->pw_name); -# else name = pwent->pw_name; -#endif } } if (name == NULL || -# ifdef USL - ia_openinfo(name, &uinfo) -# else (sp = getspnam(name)) == NULL -# endif ) { /* @@ -1835,18 +1816,11 @@ localAuthenticate( if (done == False) { -#ifdef USL - ia_get_logpwd(uinfo, &upasswd); -#endif if ( pwent->pw_passwd == NULL || pwent->pw_passwd[0] == '*' #ifdef SVR4 -# ifdef USL - || upasswd == NULL -# else || sp == NULL -# endif #endif ) { @@ -1877,11 +1851,7 @@ localAuthenticate( * Check password. */ #ifdef SVR4 -# ifdef USL - if (strcmp(crypt(passwd, upasswd), upasswd) != 0) -# else if (strcmp(crypt(passwd,sp->sp_pwdp),sp->sp_pwdp) != 0) -# endif #else if (strcmp(pwent->pw_passwd, crypt(passwd, pwent->pw_passwd)) != 0) #endif @@ -1896,12 +1866,7 @@ localAuthenticate( endpwent(); #ifdef SVR4 -# ifdef USL - ia_closeinfo(uinfo); - if (newname) free(newname); -# else endspent(); -# endif #endif return(rc); diff --git a/cde/programs/dtsession/SmRestore.c b/cde/programs/dtsession/SmRestore.c index b9cc7796..6e1e3645 100644 --- a/cde/programs/dtsession/SmRestore.c +++ b/cde/programs/dtsession/SmRestore.c @@ -4836,7 +4836,7 @@ MarkFileDescriptors ( #ifdef _SUN_OS open_max = NOFILE; #else -#if defined(USL) || defined(_AIX) +#if defined(_AIX) open_max = FOPEN_MAX; #else open_max = FD_SETSIZE; diff --git a/cde/programs/dtsession/SmUI.c b/cde/programs/dtsession/SmUI.c index 051dcc37..f3328d86 100644 --- a/cde/programs/dtsession/SmUI.c +++ b/cde/programs/dtsession/SmUI.c @@ -1161,7 +1161,7 @@ ImmediateExit( * Turn off SIGTERM so we don't catch one in the middle of shutting * down */ -#if !defined(SVR4) && !defined(sco) +#if !defined(SVR4) old = sigblock(sigmask(SIGTERM)); sigblock(sigmask(SIGHUP)); sigblock(sigmask(SIGPIPE)); diff --git a/cde/programs/dtspcd/Imakefile b/cde/programs/dtspcd/Imakefile index ccff6624..b00ccd39 100644 --- a/cde/programs/dtspcd/Imakefile +++ b/cde/programs/dtspcd/Imakefile @@ -18,12 +18,6 @@ LOCAL_LIBRARIES = $(DTHELPLIB) $(DTSVCLIB) $(TTLIB) \ SYS_LIBRARIES = -lm -ldl -lgen #endif -#if defined(USLArchitecture) -LOCAL_LIBRARIES = $(DTHELPLIB) $(DTSVCLIB) $(TTLIB) \ - $(XMLIB) $(XTOOLLIB) $(XLIB) -SYS_LIBRARIES = -lm -lgen -#endif - #if defined(LinuxArchitecture) || defined(BSDArchitecture) LOCAL_LIBRARIES = $(DTHELPLIB) $(DTSVCLIB) $(TTLIB) \ $(XMLIB) $(XTOOLLIB) $(XLIB) diff --git a/cde/programs/dtsr/Imakefile b/cde/programs/dtsr/Imakefile index 3d5eaecb..e7c801b9 100644 --- a/cde/programs/dtsr/Imakefile +++ b/cde/programs/dtsr/Imakefile @@ -16,10 +16,6 @@ DEFINES = -DMAIN_PROGRAM EXTRA_DEFINES = -DBYTE_SWAP -D_XOPEN_SOURCE -D_OSF_SOURCE #endif -#ifdef USLArchitecture -EXTRA_DEFINES = -DBYTE_SWAP -D_XOPEN_SOURCE -#endif - #if defined(i386Architecture) || defined(AMD64Architecture) || \ defined(ARMArchitecture) EXTRA_DEFINES = -DBYTE_SWAP diff --git a/cde/programs/dtterm/tests/Cborder/Imakefile b/cde/programs/dtterm/tests/Cborder/Imakefile index 1cb66328..3060f7b2 100644 --- a/cde/programs/dtterm/tests/Cborder/Imakefile +++ b/cde/programs/dtterm/tests/Cborder/Imakefile @@ -20,10 +20,6 @@ SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a XTST=/usr/openwin/lib/libXtst.a #endif -#if defined(USLArchitecture) -SYS_LIBRARIES = -lm -ldl -lgen -#endif - LOCAL_LIBRARIES = ../shared/libtermtest.a $(SYNLIB) $(XTST) $(XEXT) $(XLIB) SRCS = Cborder.c diff --git a/cde/programs/dtterm/tests/Cgeomcolor/Imakefile b/cde/programs/dtterm/tests/Cgeomcolor/Imakefile index 8c53e7f0..fb9b95f2 100644 --- a/cde/programs/dtterm/tests/Cgeomcolor/Imakefile +++ b/cde/programs/dtterm/tests/Cgeomcolor/Imakefile @@ -20,10 +20,6 @@ SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a XTST=/usr/openwin/lib/libXtst.a #endif -#if defined(USLArchitecture) -SYS_LIBRARIES = -lm -ldl -lgen -#endif - LOCAL_LIBRARIES = ../shared/libtermtest.a $(SYNLIB) $(XTST) $(XEXT) $(XLIB) SRCS = Cgeomcolor.c diff --git a/cde/programs/dtterm/tests/Ciconic/Imakefile b/cde/programs/dtterm/tests/Ciconic/Imakefile index 526acc74..f83df238 100644 --- a/cde/programs/dtterm/tests/Ciconic/Imakefile +++ b/cde/programs/dtterm/tests/Ciconic/Imakefile @@ -21,10 +21,6 @@ SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a XTST=/usr/openwin/lib/libXtst.a #endif -#if defined(USLArchitecture) -SYS_LIBRARIES = -lm -ldl -lgen -#endif - LOCAL_LIBRARIES = ../shared/libtermtest.a $(SYNLIB) $(XTST) $(XEXT) $(XLIB) SRCS = Ciconic.c diff --git a/cde/programs/dtterm/tests/Clogging/Imakefile b/cde/programs/dtterm/tests/Clogging/Imakefile index 0c3e5177..c048d876 100644 --- a/cde/programs/dtterm/tests/Clogging/Imakefile +++ b/cde/programs/dtterm/tests/Clogging/Imakefile @@ -20,10 +20,6 @@ SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a XTST=/usr/openwin/lib/libXtst.a #endif -#if defined(USLArchitecture) -SYS_LIBRARIES = -lm -ldl -lgen -#endif - LOCAL_LIBRARIES = ../shared/libtermtest.a $(SYNLIB) $(XTST) $(XEXT) $(XLIB) SRCS = Clogging.c diff --git a/cde/programs/dtterm/tests/Clogin/Imakefile b/cde/programs/dtterm/tests/Clogin/Imakefile index 4554369c..f139bf71 100644 --- a/cde/programs/dtterm/tests/Clogin/Imakefile +++ b/cde/programs/dtterm/tests/Clogin/Imakefile @@ -20,10 +20,6 @@ SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a XTST=/usr/openwin/lib/libXtst.a #endif -#if defined(USLArchitecture) -SYS_LIBRARIES = -lm -ldl -lgen -#endif - LOCAL_LIBRARIES = ../shared/libtermtest.a $(SYNLIB) $(XTST) $(XEXT) $(XLIB) SRCS = Clogin.c diff --git a/cde/programs/dtterm/tests/Csavelines/Imakefile b/cde/programs/dtterm/tests/Csavelines/Imakefile index 5081f8fe..3b54036f 100644 --- a/cde/programs/dtterm/tests/Csavelines/Imakefile +++ b/cde/programs/dtterm/tests/Csavelines/Imakefile @@ -21,10 +21,6 @@ SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a XTST=/usr/openwin/lib/libXtst.a #endif -#if defined(USLArchitecture) -SYS_LIBRARIES = -lm -ldl -lgen -#endif - LOCAL_LIBRARIES = ../shared/libtermtest.a $(SYNLIB) $(XTST) $(XEXT) $(XLIB) SRCS = Csavelines.c diff --git a/cde/programs/dtterm/tests/Cscrolltitle/Imakefile b/cde/programs/dtterm/tests/Cscrolltitle/Imakefile index 525a1cf0..c959ef9f 100644 --- a/cde/programs/dtterm/tests/Cscrolltitle/Imakefile +++ b/cde/programs/dtterm/tests/Cscrolltitle/Imakefile @@ -21,10 +21,6 @@ SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a XTST=/usr/openwin/lib/libXtst.a #endif -#if defined(USLArchitecture) -SYS_LIBRARIES = -lm -ldl -lgen -#endif - LOCAL_LIBRARIES = ../shared/libtermtest.a $(SYNLIB) $(XTST) $(XEXT) $(XLIB) SRCS = Cscrolltitle.c diff --git a/cde/programs/dtterm/tests/Ctm/Imakefile b/cde/programs/dtterm/tests/Ctm/Imakefile index 4aba1010..7169b034 100644 --- a/cde/programs/dtterm/tests/Ctm/Imakefile +++ b/cde/programs/dtterm/tests/Ctm/Imakefile @@ -21,10 +21,6 @@ SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a XTST=/usr/openwin/lib/libXtst.a #endif -#if defined(USLArchitecture) -SYS_LIBRARIES = -lm -ldl -lgen -#endif - LOCAL_LIBRARIES = ../shared/libtermtest.a $(SYNLIB) $(XTST) $(XEXT) $(XLIB) SRCS = Ctm.c diff --git a/cde/programs/dtterm/tests/Cvisualbell/Imakefile b/cde/programs/dtterm/tests/Cvisualbell/Imakefile index 7cfbbf0c..3e081790 100644 --- a/cde/programs/dtterm/tests/Cvisualbell/Imakefile +++ b/cde/programs/dtterm/tests/Cvisualbell/Imakefile @@ -21,10 +21,6 @@ SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a XTST=/usr/openwin/lib/libXtst.a #endif -#if defined(USLArchitecture) -SYS_LIBRARIES = -lm -ldl -lgen -#endif - LOCAL_LIBRARIES = ../shared/libtermtest.a $(SYNLIB) $(XTST) $(XEXT) $(XLIB) SRCS = Cvisualbell.c diff --git a/cde/programs/dtterm/tests/Rborder/Imakefile b/cde/programs/dtterm/tests/Rborder/Imakefile index 393c823c..b270b109 100644 --- a/cde/programs/dtterm/tests/Rborder/Imakefile +++ b/cde/programs/dtterm/tests/Rborder/Imakefile @@ -21,10 +21,6 @@ SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a XTST=/usr/openwin/lib/libXtst.a #endif -#if defined(USLArchitecture) -SYS_LIBRARIES = -lm -ldl -lgen -#endif - LOCAL_LIBRARIES = ../shared/libtermtest.a $(SYNLIB) $(XTST) $(XEXT) $(XLIB) SRCS = Rborder.c diff --git a/cde/programs/dtterm/tests/Rgeomcolor/Imakefile b/cde/programs/dtterm/tests/Rgeomcolor/Imakefile index e15172ef..c418159c 100644 --- a/cde/programs/dtterm/tests/Rgeomcolor/Imakefile +++ b/cde/programs/dtterm/tests/Rgeomcolor/Imakefile @@ -21,10 +21,6 @@ SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a XTST=/usr/openwin/lib/libXtst.a #endif -#if defined(USLArchitecture) -SYS_LIBRARIES = -lm -ldl -lgen -#endif - LOCAL_LIBRARIES = ../shared/libtermtest.a $(SYNLIB) $(XTST) $(XEXT) $(XLIB) SRCS = Rgeomcolor.c diff --git a/cde/programs/dtterm/tests/Riconic/Imakefile b/cde/programs/dtterm/tests/Riconic/Imakefile index 82551200..fcb10358 100644 --- a/cde/programs/dtterm/tests/Riconic/Imakefile +++ b/cde/programs/dtterm/tests/Riconic/Imakefile @@ -20,10 +20,6 @@ SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a XTST=/usr/openwin/lib/libXtst.a #endif -#if defined(USLArchitecture) -SYS_LIBRARIES = -lm -ldl -lgen -#endif - LOCAL_LIBRARIES = ../shared/libtermtest.a $(SYNLIB) $(XTST) $(XEXT) $(XLIB) SRCS = Riconic.c diff --git a/cde/programs/dtterm/tests/Rlogging/Imakefile b/cde/programs/dtterm/tests/Rlogging/Imakefile index f16273a4..33f41ce1 100644 --- a/cde/programs/dtterm/tests/Rlogging/Imakefile +++ b/cde/programs/dtterm/tests/Rlogging/Imakefile @@ -21,10 +21,6 @@ SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a XTST=/usr/openwin/lib/libXtst.a #endif -#if defined(USLArchitecture) -SYS_LIBRARIES = -lm -ldl -lgen -#endif - LOCAL_LIBRARIES = ../shared/libtermtest.a $(SYNLIB) $(XTST) $(XEXT) $(XLIB) SRCS = Rlogging.c diff --git a/cde/programs/dtterm/tests/Rlogin/Imakefile b/cde/programs/dtterm/tests/Rlogin/Imakefile index 4e6bb952..f7a55935 100644 --- a/cde/programs/dtterm/tests/Rlogin/Imakefile +++ b/cde/programs/dtterm/tests/Rlogin/Imakefile @@ -21,10 +21,6 @@ SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a XTST=/usr/openwin/lib/libXtst.a #endif -#if defined(USLArchitecture) -SYS_LIBRARIES = -lm -ldl -lgen -#endif - LOCAL_LIBRARIES = ../shared/libtermtest.a $(SYNLIB) $(XTST) $(XEXT) $(XLIB) SRCS = Rlogin.c diff --git a/cde/programs/dtterm/tests/Rpointer/Imakefile b/cde/programs/dtterm/tests/Rpointer/Imakefile index 6b853d6e..8531ed58 100644 --- a/cde/programs/dtterm/tests/Rpointer/Imakefile +++ b/cde/programs/dtterm/tests/Rpointer/Imakefile @@ -21,10 +21,6 @@ SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a XTST=/usr/openwin/lib/libXtst.a #endif -#if defined(USLArchitecture) -SYS_LIBRARIES = -lm -ldl -lgen -#endif - LOCAL_LIBRARIES = ../shared/libtermtest.a $(SYNLIB) $(XTST) $(XEXT) $(XLIB) SRCS = Rpointer.c diff --git a/cde/programs/dtterm/tests/Rsavelines/Imakefile b/cde/programs/dtterm/tests/Rsavelines/Imakefile index 0ed15e2f..3244a35b 100644 --- a/cde/programs/dtterm/tests/Rsavelines/Imakefile +++ b/cde/programs/dtterm/tests/Rsavelines/Imakefile @@ -21,10 +21,6 @@ SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a XTST=/usr/openwin/lib/libXtst.a #endif -#if defined(USLArchitecture) -SYS_LIBRARIES = -lm -ldl -lgen -#endif - LOCAL_LIBRARIES = ../shared/libtermtest.a $(SYNLIB) $(XTST) $(XEXT) $(XLIB) SRCS = Rsavelines.c diff --git a/cde/programs/dtterm/tests/Rscrolltitle/Imakefile b/cde/programs/dtterm/tests/Rscrolltitle/Imakefile index 8565a045..3c807fbf 100644 --- a/cde/programs/dtterm/tests/Rscrolltitle/Imakefile +++ b/cde/programs/dtterm/tests/Rscrolltitle/Imakefile @@ -21,10 +21,6 @@ SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a XTST=/usr/openwin/lib/libXtst.a #endif -#if defined(USLArchitecture) -SYS_LIBRARIES = -lm -ldl -lgen -#endifx - LOCAL_LIBRARIES = ../shared/libtermtest.a $(SYNLIB) $(XTST) $(XEXT) $(XLIB) SRCS = Rscrolltitle.c diff --git a/cde/programs/dtterm/tests/Rtm/Imakefile b/cde/programs/dtterm/tests/Rtm/Imakefile index e6a0377d..a21a88cc 100644 --- a/cde/programs/dtterm/tests/Rtm/Imakefile +++ b/cde/programs/dtterm/tests/Rtm/Imakefile @@ -21,10 +21,6 @@ SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a XTST=/usr/openwin/lib/libXtst.a #endif -#if defined(USLArchitecture) -SYS_LIBRARIES = -lm -ldl -lgen -#endif - LOCAL_LIBRARIES = ../shared/libtermtest.a $(SYNLIB) $(XTST) $(XEXT) $(XLIB) SRCS = Rtm.c diff --git a/cde/programs/dtterm/tests/Rvisualbell/Imakefile b/cde/programs/dtterm/tests/Rvisualbell/Imakefile index 82ce7b2e..28cb4354 100644 --- a/cde/programs/dtterm/tests/Rvisualbell/Imakefile +++ b/cde/programs/dtterm/tests/Rvisualbell/Imakefile @@ -21,10 +21,6 @@ SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a XTST=/usr/openwin/lib/libXtst.a #endif -#if defined(USLArchitecture) -SYS_LIBRARIES = -lm -ldl -lgen -#endif - LOCAL_LIBRARIES = ../shared/libtermtest.a $(SYNLIB) $(XTST) $(XEXT) $(XLIB) SRCS = Rvisualbell.c diff --git a/cde/programs/dtterm/tests/Rwrap/Imakefile b/cde/programs/dtterm/tests/Rwrap/Imakefile index e2418389..d449ad5c 100644 --- a/cde/programs/dtterm/tests/Rwrap/Imakefile +++ b/cde/programs/dtterm/tests/Rwrap/Imakefile @@ -21,10 +21,6 @@ SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a XTST=/usr/openwin/lib/libXtst.a #endif -#if defined(USLArchitecture) -SYS_LIBRARIES = -lm -ldl -lgen -#endif - LOCAL_LIBRARIES = ../shared/libtermtest.a $(SYNLIB) $(XTST) $(XEXT) $(XLIB) SRCS = Rwrap.c diff --git a/cde/programs/dtterm/tests/charatt/Imakefile b/cde/programs/dtterm/tests/charatt/Imakefile index 4fdd91da..18fcf50f 100644 --- a/cde/programs/dtterm/tests/charatt/Imakefile +++ b/cde/programs/dtterm/tests/charatt/Imakefile @@ -20,10 +20,6 @@ SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a XTST=/usr/openwin/lib/libXtst.a #endif -#if defined(USLArchitecture) -SYS_LIBRARIES = -lm -ldl -lgen -#endif - LOCAL_LIBRARIES = ../shared/libtermtest.a $(SYNLIB) $(XTST) $(XEXT) $(XLIB) SRCS = charatt.c diff --git a/cde/programs/dtterm/tests/curmove/Imakefile b/cde/programs/dtterm/tests/curmove/Imakefile index f0a6b61b..902b6064 100644 --- a/cde/programs/dtterm/tests/curmove/Imakefile +++ b/cde/programs/dtterm/tests/curmove/Imakefile @@ -20,10 +20,6 @@ SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a XTST=/usr/openwin/lib/libXtst.a #endif -#if defined(USLArchitecture) -SYS_LIBRARIES = -lm -ldl -lgen -#endif - LOCAL_LIBRARIES = ../shared/libtermtest.a $(SYNLIB) $(XTST) $(XEXT) $(XLIB) SRCS = curmove.c diff --git a/cde/programs/dtterm/tests/decmode/Imakefile b/cde/programs/dtterm/tests/decmode/Imakefile index e6f44a63..a8ca32d6 100644 --- a/cde/programs/dtterm/tests/decmode/Imakefile +++ b/cde/programs/dtterm/tests/decmode/Imakefile @@ -21,10 +21,6 @@ SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a XTST=/usr/openwin/lib/libXtst.a #endif -#if defined(USLArchitecture) -SYS_LIBRARIES = -lm -ldl -lgen -#endif - LOCAL_LIBRARIES = ../shared/libtermtest.a $(SYNLIB) $(XTST) $(XEXT) $(XLIB) SRCS = decmode.c diff --git a/cde/programs/dtterm/tests/edittest/Imakefile b/cde/programs/dtterm/tests/edittest/Imakefile index 21f2f5e7..13d1f46f 100644 --- a/cde/programs/dtterm/tests/edittest/Imakefile +++ b/cde/programs/dtterm/tests/edittest/Imakefile @@ -21,10 +21,6 @@ SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a XTST=/usr/openwin/lib/libXtst.a #endif -#if defined(USLArchitecture) -SYS_LIBRARIES = -lm -ldl -lgen -#endif - LOCAL_LIBRARIES = ../shared/libtermtest.a $(SYNLIB) $(XTST) $(XEXT) $(XLIB) SRCS = edittest.c diff --git a/cde/programs/dtterm/tests/erase/Imakefile b/cde/programs/dtterm/tests/erase/Imakefile index 61c1730b..a106213c 100644 --- a/cde/programs/dtterm/tests/erase/Imakefile +++ b/cde/programs/dtterm/tests/erase/Imakefile @@ -21,10 +21,6 @@ SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a XTST=/usr/openwin/lib/libXtst.a #endif -#if defined(USLArchitecture) -SYS_LIBRARIES = -lm -ldl -lgen -#endif - LOCAL_LIBRARIES = ../shared/libtermtest.a $(SYNLIB) $(XTST) $(XEXT) $(XLIB) SRCS = erase.c diff --git a/cde/programs/dtterm/tests/keypad/Imakefile b/cde/programs/dtterm/tests/keypad/Imakefile index 0a835825..dd57e829 100644 --- a/cde/programs/dtterm/tests/keypad/Imakefile +++ b/cde/programs/dtterm/tests/keypad/Imakefile @@ -21,10 +21,6 @@ SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a XTST=/usr/openwin/lib/libXtst.a #endif -#if defined(USLArchitecture) -SYS_LIBRARIES = -lm -ldl -lgen -#endif - LOCAL_LIBRARIES = ../shared/libtermtest.a $(SYNLIB) $(XTST) $(XEXT) $(XLIB) SRCS = keypad.c diff --git a/cde/programs/dtterm/tests/scroll/Imakefile b/cde/programs/dtterm/tests/scroll/Imakefile index 50f62f89..d62d8076 100644 --- a/cde/programs/dtterm/tests/scroll/Imakefile +++ b/cde/programs/dtterm/tests/scroll/Imakefile @@ -21,10 +21,6 @@ SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a XTST=/usr/openwin/lib/libXtst.a #endif -#if defined(USLArchitecture) -SYS_LIBRARIES = -lm -ldl -lgen -#endif - LOCAL_LIBRARIES = ../shared/libtermtest.a $(SYNLIB) $(XTST) $(XEXT) $(XLIB) SRCS = scroll.c diff --git a/cde/programs/dtterm/tests/sgr/Imakefile b/cde/programs/dtterm/tests/sgr/Imakefile index 7ce07855..ca4dceac 100644 --- a/cde/programs/dtterm/tests/sgr/Imakefile +++ b/cde/programs/dtterm/tests/sgr/Imakefile @@ -21,10 +21,6 @@ SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a XTST=/usr/openwin/lib/libXtst.a #endif -#if defined(USLArchitecture) -SYS_LIBRARIES = -lm -ldl -lgen -#endif - LOCAL_LIBRARIES = ../shared/libtermtest.a $(SYNLIB) $(XTST) $(XEXT) $(XLIB) SRCS = sgr.c diff --git a/cde/programs/dtterm/tests/shared/Imakefile b/cde/programs/dtterm/tests/shared/Imakefile index b0213ecd..9c432886 100644 --- a/cde/programs/dtterm/tests/shared/Imakefile +++ b/cde/programs/dtterm/tests/shared/Imakefile @@ -25,10 +25,6 @@ EXTRA_DEFINES = -Dapollo -D_CMDINV SYS_LIBRARIES = -lm -ldl -lgen -lC #endif -#if defined(USLArchitecture) -SYS_LIBRARIES = -lm -ldl -lgen -#endif - SRCS = synfunc.c \ esclib.c \ qalib.c diff --git a/cde/programs/dtterm/tests/tabctrl/Imakefile b/cde/programs/dtterm/tests/tabctrl/Imakefile index bca4c4e8..689b7762 100644 --- a/cde/programs/dtterm/tests/tabctrl/Imakefile +++ b/cde/programs/dtterm/tests/tabctrl/Imakefile @@ -27,10 +27,6 @@ SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a XTST=/usr/openwin/lib/libXtst.a #endif -#if defined(USLArchitecture) -SYS_LIBRARIES = -lm -ldl -lgen -#endif - LOCAL_LIBRARIES = ../shared/libtermtest.a $(SYNLIB) $(XTST) $(XEXT) $(XLIB) SRCS = tabctrl.c diff --git a/cde/programs/dtterm/tests/util/Imakefile b/cde/programs/dtterm/tests/util/Imakefile index 30e2f5bc..6932b5ef 100644 --- a/cde/programs/dtterm/tests/util/Imakefile +++ b/cde/programs/dtterm/tests/util/Imakefile @@ -26,10 +26,6 @@ SYNLIB=$(TOP)/lib/synlib/libsynlibTst.a XTST=/usr/openwin/lib/libXtst.a #endif -#if defined(USLArchitecture) -SYS_LIBRARIES = -lm -ldl -lgen -#endif - LOCAL_LIBRARIES = $(XTST) $(XEXT) $(XLIB) PROGRAMS = $(PROG1) $(PROG2) $(PROG3) diff --git a/cde/programs/dtterm/util/logger.c b/cde/programs/dtterm/util/logger.c index 9f0604e6..307c9ac3 100644 --- a/cde/programs/dtterm/util/logger.c +++ b/cde/programs/dtterm/util/logger.c @@ -72,7 +72,7 @@ main(int argc, char **argv) } /* init data... */ -#if defined(USL) || defined(linux) || defined(sun) || defined(CSRG_BASED) +#if defined(linux) || defined(sun) || defined(CSRG_BASED) (void) memset((void *) &myaddr_in, (int) '\0', sizeof(myaddr_in)); #else (void) memset(myaddr_in, '\0', sizeof(myaddr_in)); diff --git a/cde/programs/dtwm/WmFunction.c b/cde/programs/dtwm/WmFunction.c index 33e38380..6330fdd0 100644 --- a/cde/programs/dtwm/WmFunction.c +++ b/cde/programs/dtwm/WmFunction.c @@ -109,8 +109,7 @@ static unsigned int GetEventInverseMask(XEvent *event); #ifdef WSM -#if (defined(USL) || defined(linux) || \ - defined(sun) || defined(CSRG_BASED)) && !defined(_NFILE) +#if (defined(linux) || defined(sun) || defined(CSRG_BASED)) && !defined(_NFILE) #define _NFILE FOPEN_MAX #endif #define CLOSE_FILES_ON_EXEC() \ diff --git a/cde/programs/dtwm/WmPanelP.h b/cde/programs/dtwm/WmPanelP.h index 3d6c8e35..122dc51a 100644 --- a/cde/programs/dtwm/WmPanelP.h +++ b/cde/programs/dtwm/WmPanelP.h @@ -62,7 +62,7 @@ typedef struct PanelData * WmPanelistObject; #include -#if defined(_AIX) || defined(USL) +#if defined(_AIX) #include /* needed for timeval */ #endif diff --git a/cde/programs/dtwm/examples/occupy/Makefile.usl b/cde/programs/dtwm/examples/occupy/Makefile.usl deleted file mode 100644 index efd3a9d6..00000000 --- a/cde/programs/dtwm/examples/occupy/Makefile.usl +++ /dev/null @@ -1,51 +0,0 @@ -# $XConsortium: Makefile.usl /main/2 1996/05/13 11:33:55 drk $ -########################################################################## -# -# Makefile for occupy.c -# -# (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 Unix System Labs, Inc., a subsidiary of -# Novell, Inc. -########################################################################## - -#ifndef CDE_INSTALLATION_TOP - CDE_INSTALLATION_TOP = /usr/dt -#endif - -PROGRAM = occupy -SOURCES = occupy.c -OBJECTS = occupy.o - -OPTIMIZEDFLAGS = -O - -DTINCLUDE = -I$(CDE_INSTALLATION_TOP)/include -#XMINCLUDE = -I$(CDE_INSTALLATION_TOP)/include -X11INCLUDE = -I/usr/X/include -INCLUDES = $(DTINCLUDE) $(XMINCLUDE) $(X11INCLUDE) - -DTSVCLIB = -L$(CDE_INSTALLATION_TOP)/lib -lDtSvc -TTLIB = -L$(CDE_INSTALLATION_TOP)/lib -ltt -XMLIB = -L$(CDE_INSTALLATION_TOP)/lib -lXm -XTLIB = -L/usr/X/lib -lXt -X11LIB = -L/usr/X/lib -lX11 -CPLUSPLUS = -L/usr/add-on/C++/lib -lC -EXTRA_LIBS = -L/usr/lib -lgen -lnsl -lresolv -lsocket -lXIM \ - -L/usr/add-on/C++/lib -lC - -LIBRARIES = $(DTSVCLIB) $(TTLIB) $(XMLIB) $(XTLIB) \ - $(X11LIB) $(CPLUSPLUS) $(EXTRA_LIBS) -LDFLAGS = - -.c.o: - cc -c $(OPTIMIZEDFLAGS) $(INCLUDES) $< - -all:: $(PROGRAM) - -$(PROGRAM):: $(OBJECTS) - cc -o $(PROGRAM) $(LDFLAGS) $(OBJECTS) $(LIBRARIES) - -clean:: - rm -f $(PROGRAM) - rm -f $(OBJECTS) diff --git a/cde/programs/dtwm/examples/wsinfo/Makefile.usl b/cde/programs/dtwm/examples/wsinfo/Makefile.usl deleted file mode 100644 index ee0d4aee..00000000 --- a/cde/programs/dtwm/examples/wsinfo/Makefile.usl +++ /dev/null @@ -1,51 +0,0 @@ -# $XConsortium: Makefile.usl /main/2 1996/05/13 11:35:08 drk $ -########################################################################## -# -# Makefile for wsinfo.c -# -# (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 Unix System Labs, Inc., a subsidiary of -# Novell, Inc. -########################################################################## - -#ifndef CDE_INSTALLATION_TOP - CDE_INSTALLATION_TOP = /usr/dt -#endif - -PROGRAM = wsinfo -SOURCES = wsinfo.c -OBJECTS = wsinfo.o - -OPTIMIZEDFLAGS = -O - -DTINCLUDE = -I$(CDE_INSTALLATION_TOP)/include -#XMINCLUDE = -I$(CDE_INSTALLATION_TOP)/include -X11INCLUDE = -I/usr/X/include -INCLUDES = $(DTINCLUDE) $(XMINCLUDE) $(X11INCLUDE) - -DTSVCLIB = -L$(CDE_INSTALLATION_TOP)/lib -lDtSvc -TTLIB = -L$(CDE_INSTALLATION_TOP)/lib -ltt -XMLIB = -L$(CDE_INSTALLATION_TOP)/lib -lXm -XTLIB = -L/usr/X/lib -lXt -X11LIB = -L/usr/X/lib -lX11 -CPLUSPLUS = -L/usr/add-on/C++/lib -lC -EXTRA_LIBS = -L/usr/lib -lgen -lnsl -lresolv -lsocket -lXIM \ - -L/usr/add-on/C++/lib -lC - -LIBRARIES = $(DTSVCLIB) $(TTLIB) $(XMLIB) $(XTLIB) \ - $(X11LIB) $(CPLUSPLUS) $(EXTRA_LIBS) -LDFLAGS = - -.c.o: - cc -c $(OPTIMIZEDFLAGS) $(INCLUDES) $< - -all:: $(PROGRAM) - -$(PROGRAM):: $(OBJECTS) - cc -o $(PROGRAM) $(LDFLAGS) $(OBJECTS) $(LIBRARIES) - -clean:: - rm -f $(PROGRAM) - rm -f $(OBJECTS) diff --git a/cde/programs/fontaliases/Imakefile b/cde/programs/fontaliases/Imakefile index 2db63527..7a72cb1a 100644 --- a/cde/programs/fontaliases/Imakefile +++ b/cde/programs/fontaliases/Imakefile @@ -18,8 +18,6 @@ SUBDIRS = freebsd SUBDIRS = openbsd #elif defined(NetBSDArchitecture) SUBDIRS = netbsd -#elif defined(USLArchitecture) -SUBDIRS = novell #elif defined(AlphaArchitecture) SUBDIRS = dec #else diff --git a/cde/programs/fontaliases/novell/C/Imakefile b/cde/programs/fontaliases/novell/C/Imakefile deleted file mode 100644 index d399a72d..00000000 --- a/cde/programs/fontaliases/novell/C/Imakefile +++ /dev/null @@ -1,3 +0,0 @@ -XCOMM $XConsortium: Imakefile /main/2 1996/09/13 17:51:00 drk $ - -#include "../../bdf/fonts.tmpl" diff --git a/cde/programs/fontaliases/novell/C/fonts.alias b/cde/programs/fontaliases/novell/C/fonts.alias deleted file mode 100644 index 50b736f3..00000000 --- a/cde/programs/fontaliases/novell/C/fonts.alias +++ /dev/null @@ -1,178 +0,0 @@ -! $XConsortium: fonts.alias /main/2 1996/10/29 17:06:16 drk $ -"-dt-application-bold-i-normal-serif-11-80-100-100-m-60-iso8859-1" "-adobe-courier-bold-o-normal--11-80-100-100-m-60-iso8859-1" -"-dt-application-bold-i-normal-serif-14-100-100-100-m-90-iso8859-1" "-adobe-courier-bold-o-normal--14-100-100-100-m-90-iso8859-1" -"-dt-application-bold-i-normal-serif-17-120-100-100-m-100-iso8859-1" "-adobe-courier-bold-o-normal--17-120-100-100-m-100-iso8859-1" -"-dt-application-bold-i-normal-serif-20-140-100-100-m-110-iso8859-1" "-adobe-courier-bold-o-normal--20-140-100-100-m-110-iso8859-1" -"-dt-application-bold-i-normal-serif-25-180-100-100-m-150-iso8859-1" "-adobe-courier-bold-o-normal--25-180-100-100-m-150-iso8859-1" -"-dt-application-bold-i-normal-serif-34-240-100-100-m-200-iso8859-1" "-adobe-courier-bold-o-normal--34-240-100-100-m-200-iso8859-1" -"-dt-application-bold-i-normal-serif-8-80-75-75-m-50-iso8859-1" "-adobe-courier-bold-o-normal--8-80-75-75-m-50-iso8859-1" -"-dt-application-bold-i-normal-serif-10-100-75-75-m-60-iso8859-1" "-adobe-courier-bold-o-normal--10-100-75-75-m-60-iso8859-1" -"-dt-application-bold-i-normal-serif-12-120-75-75-m-70-iso8859-1" "-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1" -"-dt-application-bold-i-normal-serif-14-140-75-75-m-90-iso8859-1" "-adobe-courier-bold-o-normal--14-140-75-75-m-90-iso8859-1" -"-dt-application-bold-i-normal-serif-18-180-75-75-m-110-iso8859-1" "-adobe-courier-bold-o-normal--18-180-75-75-m-110-iso8859-1" -"-dt-application-bold-i-normal-serif-24-240-75-75-m-150-iso8859-1" "-adobe-courier-bold-o-normal--24-240-75-75-m-150-iso8859-1" -"-dt-application-bold-i-normal-sans-11-80-100-100-p-60-iso8859-1" "-adobe-helvetica-bold-o-normal--11-80-100-100-p-60-iso8859-1" -"-dt-application-bold-i-normal-sans-14-100-100-100-p-82-iso8859-1" "-adobe-helvetica-bold-o-normal--14-100-100-100-p-82-iso8859-1" -"-dt-application-bold-i-normal-sans-17-120-100-100-p-92-iso8859-1" "-adobe-helvetica-bold-o-normal--17-120-100-100-p-92-iso8859-1" -"-dt-application-bold-i-normal-sans-20-140-100-100-p-103-iso8859-1" "-adobe-helvetica-bold-o-normal--20-140-100-100-p-103-iso8859-1" -"-dt-application-bold-i-normal-sans-25-180-100-100-p-138-iso8859-1" "-adobe-helvetica-bold-o-normal--25-180-100-100-p-138-iso8859-1" -"-dt-application-bold-i-normal-sans-34-240-100-100-p-182-iso8859-1" "-adobe-helvetica-bold-o-normal--34-240-100-100-p-182-iso8859-1" -"-dt-application-bold-i-normal-serif-11-80-100-100-p-57-iso8859-1" "-adobe-times-bold-i-normal--11-80-100-100-p-57-iso8859-1" -"-dt-application-bold-i-normal-serif-14-100-100-100-p-77-iso8859-1" "-adobe-times-bold-i-normal--14-100-100-100-p-77-iso8859-1" -"-dt-application-bold-i-normal-serif-17-120-100-100-p-86-iso8859-1" "-adobe-times-bold-i-normal--17-120-100-100-p-86-iso8859-1" -"-dt-application-bold-i-normal-serif-20-140-100-100-p-98-iso8859-1" "-adobe-times-bold-i-normal--20-140-100-100-p-98-iso8859-1" -"-dt-application-bold-i-normal-serif-25-180-100-100-p-128-iso8859-1" "-adobe-times-bold-i-normal--25-180-100-100-p-128-iso8859-1" -"-dt-application-bold-i-normal-serif-34-240-100-100-p-170-iso8859-1" "-adobe-times-bold-i-normal--34-240-100-100-p-170-iso8859-1" -"-dt-application-bold-i-normal-sans-8-80-75-75-p-50-iso8859-1" "-adobe-helvetica-bold-o-normal--8-80-75-75-p-50-iso8859-1" -"-dt-application-bold-i-normal-sans-10-100-75-75-p-60-iso8859-1" "-adobe-helvetica-bold-o-normal--10-100-75-75-p-60-iso8859-1" -"-dt-application-bold-i-normal-sans-12-120-75-75-p-69-iso8859-1" "-adobe-helvetica-bold-o-normal--12-120-75-75-p-69-iso8859-1" -"-dt-application-bold-i-normal-sans-14-140-75-75-p-82-iso8859-1" "-adobe-helvetica-bold-o-normal--14-140-75-75-p-82-iso8859-1" -"-dt-application-bold-i-normal-sans-18-180-75-75-p-104-iso8859-1" "-adobe-helvetica-bold-o-normal--18-180-75-75-p-104-iso8859-1" -"-dt-application-bold-i-normal-sans-24-240-75-75-p-138-iso8859-1" "-adobe-helvetica-bold-o-normal--24-240-75-75-p-138-iso8859-1" -"-dt-application-bold-i-normal-serif-8-80-75-75-p-47-iso8859-1" "-adobe-times-bold-i-normal--8-80-75-75-p-47-iso8859-1" -"-dt-application-bold-i-normal-serif-10-100-75-75-p-57-iso8859-1" "-adobe-times-bold-i-normal--10-100-75-75-p-57-iso8859-1" -"-dt-application-bold-i-normal-serif-12-120-75-75-p-68-iso8859-1" "-adobe-times-bold-i-normal--12-120-75-75-p-68-iso8859-1" -"-dt-application-bold-i-normal-serif-14-140-75-75-p-77-iso8859-1" "-adobe-times-bold-i-normal--14-140-75-75-p-77-iso8859-1" -"-dt-application-bold-i-normal-serif-18-180-75-75-p-98-iso8859-1" "-adobe-times-bold-i-normal--18-180-75-75-p-98-iso8859-1" -"-dt-application-bold-i-normal-serif-24-240-75-75-p-128-iso8859-1" "-adobe-times-bold-i-normal--24-240-75-75-p-128-iso8859-1" -"-dt-application-bold-r-normal-serif-11-80-100-100-m-60-iso8859-1" "-adobe-courier-bold-r-normal--11-80-100-100-m-60-iso8859-1" -"-dt-application-bold-r-normal-serif-14-100-100-100-m-90-iso8859-1" "-adobe-courier-bold-r-normal--14-100-100-100-m-90-iso8859-1" -"-dt-application-bold-r-normal-serif-17-120-100-100-m-100-iso8859-1" "-adobe-courier-bold-r-normal--17-120-100-100-m-100-iso8859-1" -"-dt-application-bold-r-normal-serif-20-140-100-100-m-110-iso8859-1" "-adobe-courier-bold-r-normal--20-140-100-100-m-110-iso8859-1" -"-dt-application-bold-r-normal-serif-25-180-100-100-m-150-iso8859-1" "-adobe-courier-bold-r-normal--25-180-100-100-m-150-iso8859-1" -"-dt-application-bold-r-normal-serif-34-240-100-100-m-200-iso8859-1" "-adobe-courier-bold-r-normal--34-240-100-100-m-200-iso8859-1" -"-dt-application-bold-r-normal-serif-8-80-75-75-m-50-iso8859-1" "-adobe-courier-bold-r-normal--8-80-75-75-m-50-iso8859-1" -"-dt-application-bold-r-normal-serif-10-100-75-75-m-60-iso8859-1" "-adobe-courier-bold-r-normal--10-100-75-75-m-60-iso8859-1" -"-dt-application-bold-r-normal-serif-12-120-75-75-m-70-iso8859-1" "-adobe-courier-bold-r-normal--12-120-75-75-m-70-iso8859-1" -"-dt-application-bold-r-normal-serif-14-140-75-75-m-90-iso8859-1" "-adobe-courier-bold-r-normal--14-140-75-75-m-90-iso8859-1" -"-dt-application-bold-r-normal-serif-18-180-75-75-m-110-iso8859-1" "-adobe-courier-bold-r-normal--18-180-75-75-m-110-iso8859-1" -"-dt-application-bold-r-normal-serif-24-240-75-75-m-150-iso8859-1" "-adobe-courier-bold-r-normal--24-240-75-75-m-150-iso8859-1" -"-dt-application-bold-r-normal-sans-11-80-100-100-p-60-iso8859-1" "-adobe-helvetica-bold-r-normal--11-80-100-100-p-60-iso8859-1" -"-dt-application-bold-r-normal-sans-14-100-100-100-p-82-iso8859-1" "-adobe-helvetica-bold-r-normal--14-100-100-100-p-82-iso8859-1" -"-dt-application-bold-r-normal-sans-17-120-100-100-p-92-iso8859-1" "-adobe-helvetica-bold-r-normal--17-120-100-100-p-92-iso8859-1" -"-dt-application-bold-r-normal-sans-20-140-100-100-p-105-iso8859-1" "-adobe-helvetica-bold-r-normal--20-140-100-100-p-105-iso8859-1" -"-dt-application-bold-r-normal-sans-25-180-100-100-p-138-iso8859-1" "-adobe-helvetica-bold-r-normal--25-180-100-100-p-138-iso8859-1" -"-dt-application-bold-r-normal-sans-34-240-100-100-p-182-iso8859-1" "-adobe-helvetica-bold-r-normal--34-240-100-100-p-182-iso8859-1" -"-dt-application-bold-r-normal-serif-11-80-100-100-p-57-iso8859-1" "-adobe-times-bold-r-normal--11-80-100-100-p-57-iso8859-1" -"-dt-application-bold-r-normal-serif-14-100-100-100-p-76-iso8859-1" "-adobe-times-bold-r-normal--14-100-100-100-p-76-iso8859-1" -"-dt-application-bold-r-normal-serif-17-120-100-100-p-88-iso8859-1" "-adobe-times-bold-r-normal--17-120-100-100-p-88-iso8859-1" -"-dt-application-bold-r-normal-serif-20-140-100-100-p-100-iso8859-1" "-adobe-times-bold-r-normal--20-140-100-100-p-100-iso8859-1" -"-dt-application-bold-r-normal-serif-25-180-100-100-p-132-iso8859-1" "-adobe-times-bold-r-normal--25-180-100-100-p-132-iso8859-1" -"-dt-application-bold-r-normal-serif-34-240-100-100-p-177-iso8859-1" "-adobe-times-bold-r-normal--34-240-100-100-p-177-iso8859-1" -"-dt-application-bold-r-normal-sans-8-80-75-75-p-50-iso8859-1" "-adobe-helvetica-bold-r-normal--8-80-75-75-p-50-iso8859-1" -"-dt-application-bold-r-normal-sans-10-100-75-75-p-60-iso8859-1" "-adobe-helvetica-bold-r-normal--10-100-75-75-p-60-iso8859-1" -"-dt-application-bold-r-normal-sans-12-120-75-75-p-70-iso8859-1" "-adobe-helvetica-bold-r-normal--12-120-75-75-p-70-iso8859-1" -"-dt-application-bold-r-normal-sans-14-140-75-75-p-82-iso8859-1" "-adobe-helvetica-bold-r-normal--14-140-75-75-p-82-iso8859-1" -"-dt-application-bold-r-normal-sans-18-180-75-75-p-103-iso8859-1" "-adobe-helvetica-bold-r-normal--18-180-75-75-p-103-iso8859-1" -"-dt-application-bold-r-normal-sans-24-240-75-75-p-138-iso8859-1" "-adobe-helvetica-bold-r-normal--24-240-75-75-p-138-iso8859-1" -"-dt-application-bold-r-normal-serif-8-80-75-75-p-47-iso8859-1" "-adobe-times-bold-r-normal--8-80-75-75-p-47-iso8859-1" -"-dt-application-bold-r-normal-serif-10-100-75-75-p-57-iso8859-1" "-adobe-times-bold-r-normal--10-100-75-75-p-57-iso8859-1" -"-dt-application-bold-r-normal-serif-12-120-75-75-p-67-iso8859-1" "-adobe-times-bold-r-normal--12-120-75-75-p-67-iso8859-1" -"-dt-application-bold-r-normal-serif-14-140-75-75-p-77-iso8859-1" "-adobe-times-bold-r-normal--14-140-75-75-p-77-iso8859-1" -"-dt-application-bold-r-normal-serif-18-180-75-75-p-99-iso8859-1" "-adobe-times-bold-r-normal--18-180-75-75-p-99-iso8859-1" -"-dt-application-bold-r-normal-serif-24-240-75-75-p-132-iso8859-1" "-adobe-times-bold-r-normal--24-240-75-75-p-132-iso8859-1" -"-dt-application-medium-i-normal-serif-11-80-100-100-m-60-iso8859-1" "-adobe-courier-medium-o-normal--11-80-100-100-m-60-iso8859-1" -"-dt-application-medium-i-normal-serif-14-100-100-100-m-90-iso8859-1" "-adobe-courier-medium-o-normal--14-100-100-100-m-90-iso8859-1" -"-dt-application-medium-i-normal-serif-17-120-100-100-m-100-iso8859-1" "-adobe-courier-medium-o-normal--17-120-100-100-m-100-iso8859-1" -"-dt-application-medium-i-normal-serif-20-140-100-100-m-110-iso8859-1" "-adobe-courier-medium-o-normal--20-140-100-100-m-110-iso8859-1" -"-dt-application-medium-i-normal-serif-25-180-100-100-m-150-iso8859-1" "-adobe-courier-medium-o-normal--25-180-100-100-m-150-iso8859-1" -"-dt-application-medium-i-normal-serif-34-240-100-100-m-200-iso8859-1" "-adobe-courier-medium-o-normal--34-240-100-100-m-200-iso8859-1" -"-dt-application-medium-i-normal-serif-8-80-75-75-m-50-iso8859-1" "-adobe-courier-medium-o-normal--8-80-75-75-m-50-iso8859-1" -"-dt-application-medium-i-normal-serif-10-100-75-75-m-60-iso8859-1" "-adobe-courier-medium-o-normal--10-100-75-75-m-60-iso8859-1" -"-dt-application-medium-i-normal-serif-12-120-75-75-m-70-iso8859-1" "-adobe-courier-medium-o-normal--12-120-75-75-m-70-iso8859-1" -"-dt-application-medium-i-normal-serif-14-140-75-75-m-90-iso8859-1" "-adobe-courier-medium-o-normal--14-140-75-75-m-90-iso8859-1" -"-dt-application-medium-i-normal-serif-18-180-75-75-m-110-iso8859-1" "-adobe-courier-medium-o-normal--18-180-75-75-m-110-iso8859-1" -"-dt-application-medium-i-normal-serif-24-240-75-75-m-150-iso8859-1" "-adobe-courier-medium-o-normal--24-240-75-75-m-150-iso8859-1" -"-dt-application-medium-i-normal-sans-11-80-100-100-p-57-iso8859-1" "-adobe-helvetica-medium-o-normal--11-80-100-100-p-57-iso8859-1" -"-dt-application-medium-i-normal-sans-14-100-100-100-p-78-iso8859-1" "-adobe-helvetica-medium-o-normal--14-100-100-100-p-78-iso8859-1" -"-dt-application-medium-i-normal-sans-17-120-100-100-p-88-iso8859-1" "-adobe-helvetica-medium-o-normal--17-120-100-100-p-88-iso8859-1" -"-dt-application-medium-i-normal-sans-20-140-100-100-p-98-iso8859-1" "-adobe-helvetica-medium-o-normal--20-140-100-100-p-98-iso8859-1" -"-dt-application-medium-i-normal-sans-25-180-100-100-p-130-iso8859-1" "-adobe-helvetica-medium-o-normal--25-180-100-100-p-130-iso8859-1" -"-dt-application-medium-i-normal-sans-34-240-100-100-p-176-iso8859-1" "-adobe-helvetica-medium-o-normal--34-240-100-100-p-176-iso8859-1" -"-dt-application-medium-i-normal-serif-11-80-100-100-p-52-iso8859-1" "-adobe-times-medium-i-normal--11-80-100-100-p-52-iso8859-1" -"-dt-application-medium-i-normal-serif-14-100-100-100-p-73-iso8859-1" "-adobe-times-medium-i-normal--14-100-100-100-p-73-iso8859-1" -"-dt-application-medium-i-normal-serif-17-120-100-100-p-84-iso8859-1" "-adobe-times-medium-i-normal--17-120-100-100-p-84-iso8859-1" -"-dt-application-medium-i-normal-serif-20-140-100-100-p-94-iso8859-1" "-adobe-times-medium-i-normal--20-140-100-100-p-94-iso8859-1" -"-dt-application-medium-i-normal-serif-25-180-100-100-p-125-iso8859-1" "-adobe-times-medium-i-normal--25-180-100-100-p-125-iso8859-1" -"-dt-application-medium-i-normal-serif-34-240-100-100-p-168-iso8859-1" "-adobe-times-medium-i-normal--34-240-100-100-p-168-iso8859-1" -"-dt-application-medium-i-normal-sans-8-80-75-75-p-47-iso8859-1" "-adobe-helvetica-medium-o-normal--8-80-75-75-p-47-iso8859-1" -"-dt-application-medium-i-normal-sans-10-100-75-75-p-57-iso8859-1" "-adobe-helvetica-medium-o-normal--10-100-75-75-p-57-iso8859-1" -"-dt-application-medium-i-normal-sans-12-120-75-75-p-67-iso8859-1" "-adobe-helvetica-medium-o-normal--12-120-75-75-p-67-iso8859-1" -"-dt-application-medium-i-normal-sans-14-140-75-75-p-78-iso8859-1" "-adobe-helvetica-medium-o-normal--14-140-75-75-p-78-iso8859-1" -"-dt-application-medium-i-normal-sans-18-180-75-75-p-98-iso8859-1" "-adobe-helvetica-medium-o-normal--18-180-75-75-p-98-iso8859-1" -"-dt-application-medium-i-normal-sans-24-240-75-75-p-130-iso8859-1" "-adobe-helvetica-medium-o-normal--24-240-75-75-p-130-iso8859-1" -"-dt-application-medium-i-normal-serif-8-80-75-75-p-42-iso8859-1" "-adobe-times-medium-i-normal--8-80-75-75-p-42-iso8859-1" -"-dt-application-medium-i-normal-serif-10-100-75-75-p-52-iso8859-1" "-adobe-times-medium-i-normal--10-100-75-75-p-52-iso8859-1" -"-dt-application-medium-i-normal-serif-12-120-75-75-p-63-iso8859-1" "-adobe-times-medium-i-normal--12-120-75-75-p-63-iso8859-1" -"-dt-application-medium-i-normal-serif-14-140-75-75-p-73-iso8859-1" "-adobe-times-medium-i-normal--14-140-75-75-p-73-iso8859-1" -"-dt-application-medium-i-normal-serif-18-180-75-75-p-94-iso8859-1" "-adobe-times-medium-i-normal--18-180-75-75-p-94-iso8859-1" -"-dt-application-medium-i-normal-serif-24-240-75-75-p-125-iso8859-1" "-adobe-times-medium-i-normal--24-240-75-75-p-125-iso8859-1" -"-dt-application-medium-r-normal-serif-11-80-100-100-m-60-iso8859-1" "-adobe-courier-medium-r-normal--11-80-100-100-m-60-iso8859-1" -"-dt-application-medium-r-normal-serif-14-100-100-100-m-90-iso8859-1" "-adobe-courier-medium-r-normal--14-100-100-100-m-90-iso8859-1" -"-dt-application-medium-r-normal-serif-17-120-100-100-m-100-iso8859-1" "-adobe-courier-medium-r-normal--17-120-100-100-m-100-iso8859-1" -"-dt-application-medium-r-normal-serif-20-140-100-100-m-110-iso8859-1" "-adobe-courier-medium-r-normal--20-140-100-100-m-110-iso8859-1" -"-dt-application-medium-r-normal-serif-25-180-100-100-m-150-iso8859-1" "-adobe-courier-medium-r-normal--25-180-100-100-m-150-iso8859-1" -"-dt-application-medium-r-normal-serif-34-240-100-100-m-200-iso8859-1" "-adobe-courier-medium-r-normal--34-240-100-100-m-200-iso8859-1" -"-dt-application-medium-r-normal-serif-8-80-75-75-m-50-iso8859-1" "-adobe-courier-medium-r-normal--8-80-75-75-m-50-iso8859-1" -"-dt-application-medium-r-normal-serif-10-100-75-75-m-60-iso8859-1" "-adobe-courier-medium-r-normal--10-100-75-75-m-60-iso8859-1" -"-dt-application-medium-r-normal-serif-12-120-75-75-m-70-iso8859-1" "-adobe-courier-medium-r-normal--12-120-75-75-m-70-iso8859-1" -"-dt-application-medium-r-normal-serif-14-140-75-75-m-90-iso8859-1" "-adobe-courier-medium-r-normal--14-140-75-75-m-90-iso8859-1" -"-dt-application-medium-r-normal-serif-18-180-75-75-m-110-iso8859-1" "-adobe-courier-medium-r-normal--18-180-75-75-m-110-iso8859-1" -"-dt-application-medium-r-normal-serif-24-240-75-75-m-150-iso8859-1" "-adobe-courier-medium-r-normal--24-240-75-75-m-150-iso8859-1" -"-dt-application-medium-r-normal--11-80-100-100-p-61-dtsymbol-1" "-adobe-symbol-medium-r-normal--11-80-100-100-p-61-adobe-fontspecific" -"-dt-application-medium-r-normal--14-100-100-100-p-85-dtsymbol-1" "-adobe-symbol-medium-r-normal--14-100-100-100-p-85-adobe-fontspecific" -"-dt-application-medium-r-normal--17-120-100-100-p-95-dtsymbol-1" "-adobe-symbol-medium-r-normal--17-120-100-100-p-95-adobe-fontspecific" -"-dt-application-medium-r-normal--20-140-100-100-p-107-dtsymbol-1" "-adobe-symbol-medium-r-normal--20-140-100-100-p-107-adobe-fontspecific" -"-dt-application-medium-r-normal--25-180-100-100-p-142-dtsymbol-1" "-adobe-symbol-medium-r-normal--25-180-100-100-p-142-adobe-fontspecific" -"-dt-application-medium-r-normal--34-240-100-100-p-191-dtsymbol-1" "-adobe-symbol-medium-r-normal--34-240-100-100-p-191-adobe-fontspecific" -"-dt-application-medium-r-normal-sans-11-80-100-100-p-56-iso8859-1" "-adobe-helvetica-medium-r-normal--11-80-100-100-p-56-iso8859-1" -"-dt-application-medium-r-normal-sans-14-100-100-100-p-76-iso8859-1" "-adobe-helvetica-medium-r-normal--14-100-100-100-p-76-iso8859-1" -"-dt-application-medium-r-normal-sans-17-120-100-100-p-88-iso8859-1" "-adobe-helvetica-medium-r-normal--17-120-100-100-p-88-iso8859-1" -"-dt-application-medium-r-normal-sans-20-140-100-100-p-100-iso8859-1" "-adobe-helvetica-medium-r-normal--20-140-100-100-p-100-iso8859-1" -"-dt-application-medium-r-normal-sans-25-180-100-100-p-130-iso8859-1" "-adobe-helvetica-medium-r-normal--25-180-100-100-p-130-iso8859-1" -"-dt-application-medium-r-normal-sans-34-240-100-100-p-176-iso8859-1" "-adobe-helvetica-medium-r-normal--34-240-100-100-p-176-iso8859-1" -"-dt-application-medium-r-normal-serif-11-80-100-100-p-54-iso8859-1" "-adobe-times-medium-r-normal--11-80-100-100-p-54-iso8859-1" -"-dt-application-medium-r-normal-serif-14-100-100-100-p-74-iso8859-1" "-adobe-times-medium-r-normal--14-100-100-100-p-74-iso8859-1" -"-dt-application-medium-r-normal-serif-17-120-100-100-p-84-iso8859-1" "-adobe-times-medium-r-normal--17-120-100-100-p-84-iso8859-1" -"-dt-application-medium-r-normal-serif-20-140-100-100-p-96-iso8859-1" "-adobe-times-medium-r-normal--20-140-100-100-p-96-iso8859-1" -"-dt-application-medium-r-normal-serif-25-180-100-100-p-125-iso8859-1" "-adobe-times-medium-r-normal--25-180-100-100-p-125-iso8859-1" -"-dt-application-medium-r-normal-serif-34-240-100-100-p-170-iso8859-1" "-adobe-times-medium-r-normal--34-240-100-100-p-170-iso8859-1" -"-dt-application-medium-r-normal--8-80-75-75-p-51-dtsymbol-1" "-adobe-symbol-medium-r-normal--8-80-75-75-p-51-adobe-fontspecific" -"-dt-application-medium-r-normal--10-100-75-75-p-61-dtsymbol-1" "-adobe-symbol-medium-r-normal--10-100-75-75-p-61-adobe-fontspecific" -"-dt-application-medium-r-normal--12-120-75-75-p-74-dtsymbol-1" "-adobe-symbol-medium-r-normal--12-120-75-75-p-74-adobe-fontspecific" -"-dt-application-medium-r-normal--14-140-75-75-p-85-dtsymbol-1" "-adobe-symbol-medium-r-normal--14-140-75-75-p-85-adobe-fontspecific" -"-dt-application-medium-r-normal--18-180-75-75-p-107-dtsymbol-1" "-adobe-symbol-medium-r-normal--18-180-75-75-p-107-adobe-fontspecific" -"-dt-application-medium-r-normal--24-240-75-75-p-142-dtsymbol-1" "-adobe-symbol-medium-r-normal--24-240-75-75-p-142-adobe-fontspecific" -"-dt-application-medium-r-normal-sans-8-80-75-75-p-46-iso8859-1" "-adobe-helvetica-medium-r-normal--8-80-75-75-p-46-iso8859-1" -"-dt-application-medium-r-normal-sans-10-100-75-75-p-56-iso8859-1" "-adobe-helvetica-medium-r-normal--10-100-75-75-p-56-iso8859-1" -"-dt-application-medium-r-normal-sans-12-120-75-75-p-67-iso8859-1" "-adobe-helvetica-medium-r-normal--12-120-75-75-p-67-iso8859-1" -"-dt-application-medium-r-normal-sans-14-140-75-75-p-77-iso8859-1" "-adobe-helvetica-medium-r-normal--14-140-75-75-p-77-iso8859-1" -"-dt-application-medium-r-normal-sans-18-180-75-75-p-98-iso8859-1" "-adobe-helvetica-medium-r-normal--18-180-75-75-p-98-iso8859-1" -"-dt-application-medium-r-normal-sans-24-240-75-75-p-130-iso8859-1" "-adobe-helvetica-medium-r-normal--24-240-75-75-p-130-iso8859-1" -"-dt-application-medium-r-normal-serif-8-80-75-75-p-44-iso8859-1" "-adobe-times-medium-r-normal--8-80-75-75-p-44-iso8859-1" -"-dt-application-medium-r-normal-serif-10-100-75-75-p-54-iso8859-1" "-adobe-times-medium-r-normal--10-100-75-75-p-54-iso8859-1" -"-dt-application-medium-r-normal-serif-12-120-75-75-p-64-iso8859-1" "-adobe-times-medium-r-normal--12-120-75-75-p-64-iso8859-1" -"-dt-application-medium-r-normal-serif-14-140-75-75-p-74-iso8859-1" "-adobe-times-medium-r-normal--14-140-75-75-p-74-iso8859-1" -"-dt-application-medium-r-normal-serif-18-180-75-75-p-94-iso8859-1" "-adobe-times-medium-r-normal--18-180-75-75-p-94-iso8859-1" -"-dt-application-medium-r-normal-serif-24-240-75-75-p-124-iso8859-1" "-adobe-times-medium-r-normal--24-240-75-75-p-124-iso8859-1" -"-dt-interface system-medium-r-normal-xxs serif-10-100-75-75-p-56-iso8859-1" "-b&h-lucidabright-medium-r-normal--10-100-75-75-p-56-iso8859-1" -"-dt-interface system-medium-r-normal-xs serif-11-80-100-100-p-63-iso8859-1" "-b&h-lucidabright-medium-r-normal--11-80-100-100-p-63-iso8859-1" -"-dt-interface system-medium-r-normal-s serif-14-140-75-75-p-80-iso8859-1" "-b&h-lucidabright-medium-r-normal--14-140-75-75-p-80-iso8859-1" -"-dt-interface system-medium-r-normal-m serif-17-120-100-100-p-96-iso8859-1" "-b&h-lucidabright-medium-r-normal--17-120-100-100-p-96-iso8859-1" -"-dt-interface system-medium-r-normal-l serif-19-190-75-75-p-109-iso8859-1" "-b&h-lucidabright-medium-r-normal--19-190-75-75-p-109-iso8859-1" -"-dt-interface system-medium-r-normal-xl serif-20-140-100-100-p-114-iso8859-1" "-b&h-lucidabright-medium-r-normal--20-140-100-100-p-114-iso8859-1" -"-dt-interface system-medium-r-normal-xxl serif-24-240-75-75-p-137-iso8859-1" "-b&h-lucidabright-medium-r-normal--24-240-75-75-p-137-iso8859-1" -"-dt-interface user-bold-r-normal-xxs sans-10-100-75-75-m-60-iso8859-1" "-b&h-lucidatypewriter-bold-r-normal-sans-10-100-75-75-m-60-iso8859-1" -"-dt-interface user-bold-r-normal-xs sans-11-80-100-100-m-70-iso8859-1" "-b&h-lucidatypewriter-bold-r-normal-sans-11-80-100-100-m-70-iso8859-1" -"-dt-interface user-bold-r-normal-s sans-14-140-75-75-m-90-iso8859-1" "-b&h-lucidatypewriter-bold-r-normal-sans-14-140-75-75-m-90-iso8859-1" -"-dt-interface user-bold-r-normal-m sans-17-120-100-100-m-100-iso8859-1" "-b&h-lucidatypewriter-bold-r-normal-sans-17-120-100-100-m-100-iso8859-1" -"-dt-interface user-bold-r-normal-l sans-19-190-75-75-m-110-iso8859-1" "-b&h-lucidatypewriter-bold-r-normal-sans-19-190-75-75-m-110-iso8859-1" -"-dt-interface user-bold-r-normal-xl sans-20-140-100-100-m-120-iso8859-1" "-b&h-lucidatypewriter-bold-r-normal-sans-20-140-100-100-m-120-iso8859-1" -"-dt-interface user-bold-r-normal-xxl sans-24-240-75-75-m-140-iso8859-1" "-b&h-lucidatypewriter-bold-r-normal-sans-24-240-75-75-m-140-iso8859-1" -"-dt-interface user-medium-r-normal-xxs sans-10-100-75-75-m-60-iso8859-1" "-b&h-lucidatypewriter-medium-r-normal-sans-10-100-75-75-m-60-iso8859-1" -"-dt-interface user-medium-r-normal-xs sans-11-80-100-100-m-70-iso8859-1" "-b&h-lucidatypewriter-medium-r-normal-sans-11-80-100-100-m-70-iso8859-1" -"-dt-interface user-medium-r-normal-s sans-14-140-75-75-m-90-iso8859-1" "-b&h-lucidatypewriter-medium-r-normal-sans-14-140-75-75-m-90-iso8859-1" -"-dt-interface user-medium-r-normal-m sans-17-120-100-100-m-100-iso8859-1" "-b&h-lucidatypewriter-medium-r-normal-sans-17-120-100-100-m-100-iso8859-1" -"-dt-interface user-medium-r-normal-l sans-19-190-75-75-m-110-iso8859-1" "-b&h-lucidatypewriter-medium-r-normal-sans-19-190-75-75-m-110-iso8859-1" -"-dt-interface user-medium-r-normal-xl sans-20-140-100-100-m-120-iso8859-1" "-b&h-lucidatypewriter-medium-r-normal-sans-20-140-100-100-m-120-iso8859-1" -"-dt-interface user-medium-r-normal-xxl sans-24-240-75-75-m-140-iso8859-1" "-b&h-lucidatypewriter-medium-r-normal-sans-24-240-75-75-m-140-iso8859-1" diff --git a/cde/programs/fontaliases/novell/Imakefile b/cde/programs/fontaliases/novell/Imakefile deleted file mode 100644 index ea234b19..00000000 --- a/cde/programs/fontaliases/novell/Imakefile +++ /dev/null @@ -1,8 +0,0 @@ -XCOMM $XConsortium: Imakefile /main/1 1996/09/13 16:44:41 drk $ -#define IHaveSubdirs -#define PassCDebugFlags /**/ - -SUBDIRS = C - -MakeSubdirs($(SUBDIRS)) -DependSubdirs($(SUBDIRS)) diff --git a/cde/programs/localized/C/config/Xresources.tmsg b/cde/programs/localized/C/config/Xresources.tmsg index 97585d50..7e846963 100644 --- a/cde/programs/localized/C/config/Xresources.tmsg +++ b/cde/programs/localized/C/config/Xresources.tmsg @@ -529,234 +529,3 @@ $ LANG=sl_SI.ISO8859-2 $ LANG=lt_LT.ISO8859-4 450 Lithuanian -$ ---------------------------------------------------------------------------- -$ Login screen language list translations for USL (Novell) -$ -$ The following are the locale name to descriptive name mappings -$ for USL. When the login screen is displayed, the list of available -$ locales (valid values for $LANG) are obtained from the system. When -$ the language list menu is displayed on the login screen, the descriptive -$ text below is displayed rather than the locale name. -$ -$ For the translations below, the comment 'LANG=' provides the locale name -$ and the numbered item is the translatable descriptive text for that locale. -$ ---------------------------------------------------------------------------- - -$ LANG=C -600 US (US) - US ASCII -$ LANG=POSIX -601 US (US) - US ASCII -$ LANG=da -602 Danish (Denmark) - ISO 8859/1 -$ LANG=da_DK.850 -603 Danish (Denmark) - PC 850 -$ LANG=da_DK.865 -604 Danish (Denmark) - PC 865 -$ LANG=de -605 German (Germany) - ISO 8859/1 -$ LANG=de_DE.437 -606 German (Germany) - PC 437 -$ LANG=de_DE.850 -607 German (Germany) - PC 850 -$ LANG=de_AT -608 German (Austria) - ISO 8859/1 -$ LANG=de_AT.437 -609 German (Austria) - PC 437 -$ LANG=de_AT.850 -610 German (Austria) - PC 850 -$ LANG=de_CH -611 German (Switzerland) - ISO 8859/1 -$ LANG=de_CH.437 -612 German (Switzerland) - PC 437 -$ LANG=de_CH.850 -613 German (Switzerland) - PC 850 -$ LANG=el -614 Greek (Greece) - ISO 8859/7 - -$ LANG=en -$ 615 English (United) - Kingdom ISO -$ 615 NEW- -615 English (United Kingdom) - ISO 8859/1 -$ LANG=en_GB.437 -$ 616 English (United) - Kingdom PC -$ 616 NEW- -616 English (United Kingdom) - PC 437 -$ LANG=en_GB.646 -$ 617 English (United) - Kingdom ISO -$ 617 NEW- -617 English (United Kingdom) - ISO 646 -$ LANG=en_GB.850 -$ 618 English (United) - Kingdom PC -$ 618 NEW- -618 English (United Kingdom) - PC 850 - -$ LANG=en_AU -619 English (Australia) - ISO 8859/1 -$ LANG=en_AU.437 -620 English (Australia) - PC 437 -$ LANG=en_AU.646 -621 English (Australia) - ISO 646 -$ LANG=en_AU.850 -622 English (Australia) - PC 850 -$ LANG=en_CA -623 English (Canada) - ISO 8859/1 -$ LANG=en_CA.437 -624 English (Canada) - PC 437 -$ LANG=en_CA.646 -625 English (Canada) - ISO 646 -$ LANG=en_CA.850 -626 English (Canada) - PC 850 -$ LANG=en_IR -627 English (Ireland) - ISO 8859/1 -$ LANG=en_IR.437 -628 English (Ireland) - PC 437 -$ LANG=en_IR.850 -629 English (Ireland) - PC 850 -$ LANG=en_IR.646 -630 English (Ireland) - ISO 646 - -$ LANG=en_NZ -$ 631 English (New) - Zealand ISO -$ 631 NEW- -631 English (New Zealand) - ISO 8859/1 -$ LANG=en_NZ.437 -$ 632 English (New) - Zealand PC -$ 632 NEW- -632 English (New Zealand) - PC 437 -$ LANG=en_NZ.850 -$ 633 English (New) - Zealand PC -$ 633 NEW- -633 English (New Zealand) - PC 850 -$ LANG=en_NZ.646 -$ 634 English (New) - Zealand PC -$ 634 NEW- -634 English (New Zealand) - PC 646 -$ LANG=en_US -$ 635 English (United) - States ISO -$ 635 NEW- -635 English (United States) - ISO 8859/1 -$ LANG=en_US.437 -$ 636 English (United) - States PC -$ 636 NEW- -636 English (United States) - PC 437 -$ LANG=en_US.646 -$ 637 English (United) - States ISO -$ 637 NEW- -637 English (United States) - ISO 646 -$ LANG=en_US.850 -$ 638 English (United) - States PC -$ 638 NEW- -638 English (United States) - PC 850 - -$ LANG=es -639 Spanish (Spain) - ISO 8859/1 -$ LANG=es_ES.437 -640 Spanish (Spain) - PC 437 -$ LANG=es_ES.850 -641 Spanish (Spain) - PC 850 -$ LANG=es_AR -642 Spanish (Argentina) - ISO 8859/1 -$ LANG=es_AR.437 -643 Spanish (Argentina) - PC 437 -$ LANG=es_AR.850 -644 Spanish (Argentina) - PC 850 -$ LANG=es_CL -645 Spanish (Chile) - ISO 8859/1 -$ LANG=es_CL.437 -646 Spanish (Chile) - PC 437 -$ LANG=es_CL.850 -647 Spanish (Chile) - PC 850 -$ LANG=es_MX -648 Spanish (Mexico) - ISO 8859/1 -$ LANG=es_MX.437 -649 Spanish (Mexico) - PC 437 -$ LANG=es_MX.850 -650 Spanish (Mexico) - PC 850 -$ LANG=es_VE -651 Spanish (Venezuela) - ISO 8859/1 -$ LANG=es_VE.437 -652 Spanish (Venezuela) - PC 437 -$ LANG=es_VE.850 -653 Spanish (Venezuela) - PC 850 -$ LANG=fi -654 Finnish (Finland) - ISO 8859/1 -$ LANG=fi_FI.437 -655 Finnish (Finland) - PC 437 -$ LANG=fi_FI.850 -656 Finnish (Finland) - PC 850 -$ LANG=fr -657 French (France) - ISO 8859/1 -$ LANG=fr_FR.437 -658 French (France) - PC 437 -$ LANG=fr_FR.850 -659 French (France) - PC 850 -$ LANG=fr_BE -660 French (Belgium) - ISO 8859/1 -$ LANG=fr_BE.437 -661 French (Belgium) - PC 437 -$ LANG=fr_BE.850 -662 French (Belgium) - PC 850 -$ LANG=fr_CA -663 French (Canada) - ISO 8859/1 -$ LANG=fr_CA.850 -664 French (Canada) - PC 850 -$ LANG=fr_CA.863 -665 French (Canada) - PC 863 -$ LANG=fr_CH -666 French (Switzerland) - ISO 8859/1 -$ LANG=fr_CH.437 -667 French (Switzerland) - PC 437 -$ LANG=fr_CH.850 -668 French (Switzerland) - PC 850 -$ LANG=is -669 Icelandic (Iceland) - ISO 8859/1 -$ LANG=is_IS.850 -670 Icelandic (Iceland) - PC 850 -$ LANG=it -671 Italian (Italy) - ISO 8859/1 -$ LANG=it_IT.437 -672 Italian (Italy) - PC 437 -$ LANG=it_IT.850 -673 Italian (Italy) - PC 850 -$ LANG=it_CH -674 Italian (Switzerland) - ISO 8859/1 -$ LANG=it_CH.437 -675 Italian (Switzerland) - PC 437 -$ LANG=it_CH.850 -676 Italian (Switzerland) - PC 850 -$ LANG=ja -677 Japanese (Japan) - JIS X -$ LANG=ja_JP.EUC -678 Japanese (Japan) - JIS X -$ LANG=nl -679 Dutch (Netherlands) - ISO 8859/1 -$ LANG=nl_NL.437 -680 Dutch (Netherlands) - PC 437 -$ LANG=nl_NL.850 -681 Dutch (Netherlands) - PC 850 -$ LANG=nl_BE -682 Dutch (Belgium) - ISO 8859/1 -$ LANG=nl_BE.437 -683 Dutch (Belgium) - PC 437 -$ LANG=nl_BE.850 -684 Dutch (Belgium) - PC 850 -$ LANG=no -685 Norwegian (Norway) - ISO 8859/1 -$ LANG=no_NO.850 -686 Norwegian (Norway) - PC 850 -$ LANG=no_NO.865 -687 Norwegian (Norway) - PC 865 -$ LANG=pt -688 Portuguese (Portugal) - ISO 8859/1 -$ LANG=pt_BR -689 Portuguese (Brazil) - ISO 8859/1 -$ LANG=pt_PT.850 -690 Portuguese (Portugal) - PC 850 -$ LANG=pt_PT.860 -691 Portuguese (Portugal) - PC 860 -$ LANG=sv -692 Swedish (Sweden) - ISO 8859/1 -$ LANG=sv_SE.437 -693 Swedish (Sweden) - PC 437 -$ LANG=sv_SE.850 -694 Swedish (Sweden) - PC 850 diff --git a/cde/programs/localized/de_DE.ISO8859-1/config/Xresources.tmsg b/cde/programs/localized/de_DE.ISO8859-1/config/Xresources.tmsg index d6ab670c..1c3d2244 100644 --- a/cde/programs/localized/de_DE.ISO8859-1/config/Xresources.tmsg +++ b/cde/programs/localized/de_DE.ISO8859-1/config/Xresources.tmsg @@ -669,235 +669,3 @@ $ LANG=sl_SI.ISO8859-2 449 Slovenisch $ LANG=lt_LT.ISO8859-4 450 Litauisch - -$ ---------------------------------------------------------------------------- -$ Login screen language list translations for USL (Novell) -$ -$ The following are the locale name to descriptive name mappings -$ for USL. When the login screen is displayed, the list of available -$ locales (valid values for $LANG) are obtained from the system. When -$ the language list menu is displayed on the login screen, the descriptive -$ text below is displayed rather than the locale name. -$ -$ For the translations below, the comment 'LANG=' provides the locale name -$ and the numbered item is the translatable descriptive text for that locale. -$ ---------------------------------------------------------------------------- - -$ LANG=C -600 Amerikanisch (USA) - US ASCII -$ LANG=POSIX -601 Amerikanisch (USA) - US ASCII -$ LANG=da -602 Dänisch (Dänemark) - ISO 8859/1 -$ LANG=da_DK.850 -603 Dänisch (Dänemark) - PC 850 -$ LANG=da_DK.865 -604 Dänisch (Dänemark) - PC 865 -$ LANG=de -605 Deutsch (Deutschland) - ISO 8859/1 -$ LANG=de_DE.437 -606 Deutsch (Deutschland) - PC 437 -$ LANG=de_DE.850 -607 Deutsch (Deutschland) - PC 850 -$ LANG=de_AT -608 Deutsch (Österreich) - ISO 8859/1 -$ LANG=de_AT.437 -609 Deutsch (Österreich) - PC 437 -$ LANG=de_AT.850 -610 Deutsch (Österreich) - PC 850 -$ LANG=de_CH -611 Deutsch (Schweiz) - ISO 8859/1 -$ LANG=de_CH.437 -612 Deutsch (Schweiz) - PC 437 -$ LANG=de_CH.850 -613 Deutsch (Schweiz) - PC 850 -$ LANG=el -614 Griechisch (Griechenland) - ISO 8859/7 - -$ LANG=en -$ 615 Englisch (Vereinigtes) - Königreich ISO -$ 615 NEW- -615 English (United Kingdom) - ISO 8859/1 -$ LANG=en_GB.437 -$ 616 Englisch (Vereinigtes) - Königreich PC -$ 616 NEW- -616 English (United Kingdom) - PC 437 -$ LANG=en_GB.646 -$ 617 Englisch (Vereinigtes) - Königreich ISO -$ 617 NEW- -617 English (United Kingdom) - ISO 646 -$ LANG=en_GB.850 -$ 618 Englisch (Vereinigtes) - Königreich PC -$ 618 NEW- -618 English (United Kingdom) - PC 850 - -$ LANG=en_AU -619 Englisch (Australien) - ISO 8859/1 -$ LANG=en_AU.437 -620 Englisch (Australien) - PC 437 -$ LANG=en_AU.646 -621 Englisch (Australien) - ISO 646 -$ LANG=en_AU.850 -622 Englisch (Australien) - PC 850 -$ LANG=en_CA -623 Englisch (Kanada) - ISO 8859/1 -$ LANG=en_CA.437 -624 Englisch (Kanada) - PC 437 -$ LANG=en_CA.646 -625 Englisch (Kanada) - ISO 646 -$ LANG=en_CA.850 -626 Englisch (Kanada) - PC 850 -$ LANG=en_IR -627 Englisch (Irland) - ISO 8859/1 -$ LANG=en_IR.437 -628 Englisch (Irland) - PC 437 -$ LANG=en_IR.850 -629 Englisch (Irland) - PC 850 -$ LANG=en_IR.646 -630 Englisch (Irland) - ISO 646 - -$ LANG=en_NZ -$ 631 Englisch (Neu) - Seeland ISO -$ 631 NEW- -631 English (New Zealand) - ISO 8859/1 -$ LANG=en_NZ.437 -$ 632 Englisch (Neu) - Seeland PC -$ 632 NEW- -632 English (New Zealand) - PC 437 -$ LANG=en_NZ.850 -$ 633 Englisch (Neu) - Seeland PC -$ 633 NEW- -633 English (New Zealand) - PC 850 -$ LANG=en_NZ.646 -$ 634 Englisch (Neu) - Seeland PC -$ 634 NEW- -634 English (New Zealand) - PC 646 -$ LANG=en_US -$ 635 Englisch (Vereinigte) - Staaten ISO -$ 635 NEW- -635 English (United States) - ISO 8859/1 -$ LANG=en_US.437 -$ 636 Englisch (Vereinigte) - Staaten PC -$ 636 NEW- -636 English (United States) - PC 437 -$ LANG=en_US.646 -$ 637 Englisch (Vereinigte) - Staaten ISO -$ 637 NEW- -637 English (United States) - ISO 646 -$ LANG=en_US.850 -$ 638 Englisch (Vereinigte) - Staaten PC -$ 638 NEW- -638 English (United States) - PC 850 - -$ LANG=es -639 Spanisch (Spanien) - ISO 8859/1 -$ LANG=es_ES.437 -640 Spanisch (Spanien) - PC 437 -$ LANG=es_ES.850 -641 Spanisch (Spanien) - PC 850 -$ LANG=es_AR -642 Spanisch (Argentinien) - ISO 8859/1 -$ LANG=es_AR.437 -643 Spanisch (Argentinien) - PC 437 -$ LANG=es_AR.850 -644 Spanisch (Argentinien) - PC 850 -$ LANG=es_CL -645 Spanisch (Chile) - ISO 8859/1 -$ LANG=es_CL.437 -646 Spanisch (Chile) - PC 437 -$ LANG=es_CL.850 -647 Spanisch (Chile) - PC 850 -$ LANG=es_MX -648 Spanisch (Mexiko) - ISO 8859/1 -$ LANG=es_MX.437 -649 Spanisch (Mexiko) - PC 437 -$ LANG=es_MX.850 -650 Spanisch (Mexiko) - PC 850 -$ LANG=es_VE -651 Spanisch (Venezuela) - ISO 8859/1 -$ LANG=es_VE.437 -652 Spanisch (Venezuela) - PC 437 -$ LANG=es_VE.850 -653 Spanisch (Venezuela) - PC 850 -$ LANG=fi -654 Finnisch (Finnland) - ISO 8859/1 -$ LANG=fi_FI.437 -655 Finnisch (Finnland) - PC 437 -$ LANG=fi_FI.850 -656 Finnisch (Finnland) - PC 850 -$ LANG=fr -657 Französisch (Frankreich) - ISO 8859/1 -$ LANG=fr_FR.437 -658 Französisch (Frankreich) - PC 437 -$ LANG=fr_FR.850 -659 Französisch (Frankreich) - PC 850 -$ LANG=fr_BE -660 Französisch (Belgien) - ISO 8859/1 -$ LANG=fr_BE.437 -661 Französisch (Belgien) - PC 437 -$ LANG=fr_BE.850 -662 Französisch (Belgien) - PC 850 -$ LANG=fr_CA -663 Französisch (Kanada) - ISO 8859/1 -$ LANG=fr_CA.850 -664 Französisch (Kanada) - PC 850 -$ LANG=fr_CA.863 -665 Französisch (Kanada) - PC 863 -$ LANG=fr_CH -666 Französisch (Schweiz) - ISO 8859/1 -$ LANG=fr_CH.437 -667 Französisch (Schweiz) - PC 437 -$ LANG=fr_CH.850 -668 Französisch (Schweiz) - PC 850 -$ LANG=is -669 Isländisch (Island) - ISO 8859/1 -$ LANG=is_IS.850 -670 Isländisch (Island) - PC 850 -$ LANG=it -671 Italienisch (Italien) - ISO 8859/1 -$ LANG=it_IT.437 -672 Italienisch (Italien) - PC 437 -$ LANG=it_IT.850 -673 Italienisch (Italien) - PC 850 -$ LANG=it_CH -674 Italienisch (Schweiz) - ISO 8859/1 -$ LANG=it_CH.437 -675 Italienisch (Schweiz) - PC 437 -$ LANG=it_CH.850 -676 Italienisch (Schweiz) - PC 850 -$ LANG=ja -677 Japanisch (Japan) - JIS X -$ LANG=ja_JP.EUC -678 Japanisch (Japan) - JIS X -$ LANG=nl -679 Niederländisch (Niederlande) - ISO 8859/1 -$ LANG=nl_NL.437 -680 Niederländisch (Niederlande) - PC 437 -$ LANG=nl_NL.850 -681 Niederländisch (Niederlande) - PC 850 -$ LANG=nl_BE -682 Niederländisch (Belgien) - ISO 8859/1 -$ LANG=nl_BE.437 -683 Niederländisch (Belgien) - PC 437 -$ LANG=nl_BE.850 -684 Niederländisch (Belgien) - PC 850 -$ LANG=no -685 Norwegisch (Norwegen) - ISO 8859/1 -$ LANG=no_NO.850 -686 Norwegisch (Norwegen) - PC 850 -$ LANG=no_NO.865 -687 Norwegisch (Norwegen) - PC 865 -$ LANG=pt -688 Portugiesisch (Portugal) - ISO 8859/1 -$ LANG=pt_BR -689 Portugiesisch (Brasilien) - ISO 8859/1 -$ LANG=pt_PT.850 -690 Portugiesisch (Portugal) - PC 850 -$ LANG=pt_PT.860 -691 Portugiesisch (Portugal) - PC 860 -$ LANG=sv -692 Schwedisch (Schweden) - ISO 8859/1 -$ LANG=sv_SE.437 -693 Schwedisch (Schweden) - PC 437 -$ LANG=sv_SE.850 -694 Schwedisch (Schweden) - PC 850 diff --git a/cde/programs/localized/el_GR.UTF-8/config/Xresources.tmsg b/cde/programs/localized/el_GR.UTF-8/config/Xresources.tmsg index 97585d50..d7e69bce 100644 --- a/cde/programs/localized/el_GR.UTF-8/config/Xresources.tmsg +++ b/cde/programs/localized/el_GR.UTF-8/config/Xresources.tmsg @@ -528,235 +528,3 @@ $ LANG=sl_SI.ISO8859-2 449 Slovene $ LANG=lt_LT.ISO8859-4 450 Lithuanian - -$ ---------------------------------------------------------------------------- -$ Login screen language list translations for USL (Novell) -$ -$ The following are the locale name to descriptive name mappings -$ for USL. When the login screen is displayed, the list of available -$ locales (valid values for $LANG) are obtained from the system. When -$ the language list menu is displayed on the login screen, the descriptive -$ text below is displayed rather than the locale name. -$ -$ For the translations below, the comment 'LANG=' provides the locale name -$ and the numbered item is the translatable descriptive text for that locale. -$ ---------------------------------------------------------------------------- - -$ LANG=C -600 US (US) - US ASCII -$ LANG=POSIX -601 US (US) - US ASCII -$ LANG=da -602 Danish (Denmark) - ISO 8859/1 -$ LANG=da_DK.850 -603 Danish (Denmark) - PC 850 -$ LANG=da_DK.865 -604 Danish (Denmark) - PC 865 -$ LANG=de -605 German (Germany) - ISO 8859/1 -$ LANG=de_DE.437 -606 German (Germany) - PC 437 -$ LANG=de_DE.850 -607 German (Germany) - PC 850 -$ LANG=de_AT -608 German (Austria) - ISO 8859/1 -$ LANG=de_AT.437 -609 German (Austria) - PC 437 -$ LANG=de_AT.850 -610 German (Austria) - PC 850 -$ LANG=de_CH -611 German (Switzerland) - ISO 8859/1 -$ LANG=de_CH.437 -612 German (Switzerland) - PC 437 -$ LANG=de_CH.850 -613 German (Switzerland) - PC 850 -$ LANG=el -614 Greek (Greece) - ISO 8859/7 - -$ LANG=en -$ 615 English (United) - Kingdom ISO -$ 615 NEW- -615 English (United Kingdom) - ISO 8859/1 -$ LANG=en_GB.437 -$ 616 English (United) - Kingdom PC -$ 616 NEW- -616 English (United Kingdom) - PC 437 -$ LANG=en_GB.646 -$ 617 English (United) - Kingdom ISO -$ 617 NEW- -617 English (United Kingdom) - ISO 646 -$ LANG=en_GB.850 -$ 618 English (United) - Kingdom PC -$ 618 NEW- -618 English (United Kingdom) - PC 850 - -$ LANG=en_AU -619 English (Australia) - ISO 8859/1 -$ LANG=en_AU.437 -620 English (Australia) - PC 437 -$ LANG=en_AU.646 -621 English (Australia) - ISO 646 -$ LANG=en_AU.850 -622 English (Australia) - PC 850 -$ LANG=en_CA -623 English (Canada) - ISO 8859/1 -$ LANG=en_CA.437 -624 English (Canada) - PC 437 -$ LANG=en_CA.646 -625 English (Canada) - ISO 646 -$ LANG=en_CA.850 -626 English (Canada) - PC 850 -$ LANG=en_IR -627 English (Ireland) - ISO 8859/1 -$ LANG=en_IR.437 -628 English (Ireland) - PC 437 -$ LANG=en_IR.850 -629 English (Ireland) - PC 850 -$ LANG=en_IR.646 -630 English (Ireland) - ISO 646 - -$ LANG=en_NZ -$ 631 English (New) - Zealand ISO -$ 631 NEW- -631 English (New Zealand) - ISO 8859/1 -$ LANG=en_NZ.437 -$ 632 English (New) - Zealand PC -$ 632 NEW- -632 English (New Zealand) - PC 437 -$ LANG=en_NZ.850 -$ 633 English (New) - Zealand PC -$ 633 NEW- -633 English (New Zealand) - PC 850 -$ LANG=en_NZ.646 -$ 634 English (New) - Zealand PC -$ 634 NEW- -634 English (New Zealand) - PC 646 -$ LANG=en_US -$ 635 English (United) - States ISO -$ 635 NEW- -635 English (United States) - ISO 8859/1 -$ LANG=en_US.437 -$ 636 English (United) - States PC -$ 636 NEW- -636 English (United States) - PC 437 -$ LANG=en_US.646 -$ 637 English (United) - States ISO -$ 637 NEW- -637 English (United States) - ISO 646 -$ LANG=en_US.850 -$ 638 English (United) - States PC -$ 638 NEW- -638 English (United States) - PC 850 - -$ LANG=es -639 Spanish (Spain) - ISO 8859/1 -$ LANG=es_ES.437 -640 Spanish (Spain) - PC 437 -$ LANG=es_ES.850 -641 Spanish (Spain) - PC 850 -$ LANG=es_AR -642 Spanish (Argentina) - ISO 8859/1 -$ LANG=es_AR.437 -643 Spanish (Argentina) - PC 437 -$ LANG=es_AR.850 -644 Spanish (Argentina) - PC 850 -$ LANG=es_CL -645 Spanish (Chile) - ISO 8859/1 -$ LANG=es_CL.437 -646 Spanish (Chile) - PC 437 -$ LANG=es_CL.850 -647 Spanish (Chile) - PC 850 -$ LANG=es_MX -648 Spanish (Mexico) - ISO 8859/1 -$ LANG=es_MX.437 -649 Spanish (Mexico) - PC 437 -$ LANG=es_MX.850 -650 Spanish (Mexico) - PC 850 -$ LANG=es_VE -651 Spanish (Venezuela) - ISO 8859/1 -$ LANG=es_VE.437 -652 Spanish (Venezuela) - PC 437 -$ LANG=es_VE.850 -653 Spanish (Venezuela) - PC 850 -$ LANG=fi -654 Finnish (Finland) - ISO 8859/1 -$ LANG=fi_FI.437 -655 Finnish (Finland) - PC 437 -$ LANG=fi_FI.850 -656 Finnish (Finland) - PC 850 -$ LANG=fr -657 French (France) - ISO 8859/1 -$ LANG=fr_FR.437 -658 French (France) - PC 437 -$ LANG=fr_FR.850 -659 French (France) - PC 850 -$ LANG=fr_BE -660 French (Belgium) - ISO 8859/1 -$ LANG=fr_BE.437 -661 French (Belgium) - PC 437 -$ LANG=fr_BE.850 -662 French (Belgium) - PC 850 -$ LANG=fr_CA -663 French (Canada) - ISO 8859/1 -$ LANG=fr_CA.850 -664 French (Canada) - PC 850 -$ LANG=fr_CA.863 -665 French (Canada) - PC 863 -$ LANG=fr_CH -666 French (Switzerland) - ISO 8859/1 -$ LANG=fr_CH.437 -667 French (Switzerland) - PC 437 -$ LANG=fr_CH.850 -668 French (Switzerland) - PC 850 -$ LANG=is -669 Icelandic (Iceland) - ISO 8859/1 -$ LANG=is_IS.850 -670 Icelandic (Iceland) - PC 850 -$ LANG=it -671 Italian (Italy) - ISO 8859/1 -$ LANG=it_IT.437 -672 Italian (Italy) - PC 437 -$ LANG=it_IT.850 -673 Italian (Italy) - PC 850 -$ LANG=it_CH -674 Italian (Switzerland) - ISO 8859/1 -$ LANG=it_CH.437 -675 Italian (Switzerland) - PC 437 -$ LANG=it_CH.850 -676 Italian (Switzerland) - PC 850 -$ LANG=ja -677 Japanese (Japan) - JIS X -$ LANG=ja_JP.EUC -678 Japanese (Japan) - JIS X -$ LANG=nl -679 Dutch (Netherlands) - ISO 8859/1 -$ LANG=nl_NL.437 -680 Dutch (Netherlands) - PC 437 -$ LANG=nl_NL.850 -681 Dutch (Netherlands) - PC 850 -$ LANG=nl_BE -682 Dutch (Belgium) - ISO 8859/1 -$ LANG=nl_BE.437 -683 Dutch (Belgium) - PC 437 -$ LANG=nl_BE.850 -684 Dutch (Belgium) - PC 850 -$ LANG=no -685 Norwegian (Norway) - ISO 8859/1 -$ LANG=no_NO.850 -686 Norwegian (Norway) - PC 850 -$ LANG=no_NO.865 -687 Norwegian (Norway) - PC 865 -$ LANG=pt -688 Portuguese (Portugal) - ISO 8859/1 -$ LANG=pt_BR -689 Portuguese (Brazil) - ISO 8859/1 -$ LANG=pt_PT.850 -690 Portuguese (Portugal) - PC 850 -$ LANG=pt_PT.860 -691 Portuguese (Portugal) - PC 860 -$ LANG=sv -692 Swedish (Sweden) - ISO 8859/1 -$ LANG=sv_SE.437 -693 Swedish (Sweden) - PC 437 -$ LANG=sv_SE.850 -694 Swedish (Sweden) - PC 850 diff --git a/cde/programs/localized/es_ES.ISO8859-1/config/Xresources.tmsg b/cde/programs/localized/es_ES.ISO8859-1/config/Xresources.tmsg index f49d1b8c..994e600f 100644 --- a/cde/programs/localized/es_ES.ISO8859-1/config/Xresources.tmsg +++ b/cde/programs/localized/es_ES.ISO8859-1/config/Xresources.tmsg @@ -669,235 +669,3 @@ $ LANG=sl_SI.ISO8859-2 449 Esloveno $ LANG=lt_LT.ISO8859-4 450 Lituano - -$ ---------------------------------------------------------------------------- -$ Login screen language list translations for USL (Novell) -$ -$ The following are the locale name to descriptive name mappings -$ for USL. When the login screen is displayed, the list of available -$ locales (valid values for $LANG) are obtained from the system. When -$ the language list menu is displayed on the login screen, the descriptive -$ text below is displayed rather than the locale name. -$ -$ For the translations below, the comment 'LANG=' provides the locale name -$ and the numbered item is the translatable descriptive text for that locale. -$ ---------------------------------------------------------------------------- - -$ LANG=C -600 EE.UU. (EE.UU.) - ASCII EE.UU. -$ LANG=POSIX -601 EE.UU. (EE.UU.) - ASCII EE.UU. -$ LANG=da -602 Danés (Dinamarca) - ISO 8859/1 -$ LANG=da_DK.850 -603 Danés (Dinamarca) - PC 850 -$ LANG=da_DK.865 -604 Danés (Dinamarca) - PC 865 -$ LANG=de -605 Alemán (Alemania) - ISO 8859/1 -$ LANG=de_DE.437 -606 Alemán (Alemania) - PC 437 -$ LANG=de_DE.850 -607 Alemán (Alemania) - PC 850 -$ LANG=de_AT -608 Alemán (Austria) - ISO 8859/1 -$ LANG=de_AT.437 -609 Alemán (Austria) - PC 437 -$ LANG=de_AT.850 -610 Alemán (Austria) - PC 850 -$ LANG=de_CH -611 Alemán (Suiza) - ISO 8859/1 -$ LANG=de_CH.437 -612 Alemán (Suiza) - PC 437 -$ LANG=de_CH.850 -613 Alemán (Suiza) - PC 850 -$ LANG=el -614 Griego (Grecia) - ISO 8859/7 - -$ LANG=en -$ 615 Inglés (Reino Unido) - Kingdom ISO -$ 615 NEW- -615 English (United Kingdom) - ISO 8859/1 -$ LANG=en_GB.437 -$ 616 Inglés (Reino Unido) - Kingdom PC -$ 616 NEW- -616 English (United Kingdom) - PC 437 -$ LANG=en_GB.646 -$ 617 Inglés (Reino Unido) - Kingdom ISO -$ 617 NEW- -617 English (United Kingdom) - ISO 646 -$ LANG=en_GB.850 -$ 618 Inglés (Reino Unido) - Kingdom PC -$ 618 NEW- -618 English (United Kingdom) - PC 850 - -$ LANG=en_AU -619 Inglés (Australia) - ISO 8859/1 -$ LANG=en_AU.437 -620 Inglés (Australia) - PC 437 -$ LANG=en_AU.646 -621 Inglés (Australia) - ISO 646 -$ LANG=en_AU.850 -622 Inglés (Australia) - PC 850 -$ LANG=en_CA -623 Inglés (Canadá) - ISO 8859/1 -$ LANG=en_CA.437 -624 Inglés (Canadá) - PC 437 -$ LANG=en_CA.646 -625 Inglés (Canadá) - ISO 646 -$ LANG=en_CA.850 -626 Inglés (Canadá) - PC 850 -$ LANG=en_IR -627 Inglés (Irlanda) - ISO 8859/1 -$ LANG=en_IR.437 -628 Inglés (Irlanda) - PC 437 -$ LANG=en_IR.850 -629 Inglés (Irlanda) - PC 850 -$ LANG=en_IR.646 -630 Inglés (Irlanda) - ISO 646 - -$ LANG=en_NZ -$ 631 Inglés (Nueva Zelanda) - Zealand ISO -$ 631 NEW- -631 English (New Zealand) - ISO 8859/1 -$ LANG=en_NZ.437 -$ 632 Inglés (Nueva Zelanda) - Zealand PC -$ 632 NEW- -632 English (New Zealand) - PC 437 -$ LANG=en_NZ.850 -$ 633 Inglés (Nueva Zelanda) - Zealand PC -$ 633 NEW- -633 English (New Zealand) - PC 850 -$ LANG=en_NZ.646 -$ 634 Inglés (Nueva Zelanda) - Zealand PC -$ 634 NEW- -634 English (New Zealand) - PC 646 -$ LANG=en_US -$ 635 Inglés (Estados Unidos) - States ISO -$ 635 NEW- -635 English (United States) - ISO 8859/1 -$ LANG=en_US.437 -$ 636 Inglés (Estados Unidos) - States PC -$ 636 NEW- -636 English (United States) - PC 437 -$ LANG=en_US.646 -$ 637 Inglés (Estados Unidos) - States ISO -$ 637 NEW- -637 English (United States) - ISO 646 -$ LANG=en_US.850 -$ 638 Inglés (Estados Unidos) - States PC -$ 638 NEW- -638 English (United States) - PC 850 - -$ LANG=es -639 Español (España) - ISO 8859/1 -$ LANG=es_ES.437 -640 Español (España) - PC 437 -$ LANG=es_ES.850 -641 Español (España) - PC 850 -$ LANG=es_AR -642 Español (Argentina) - ISO 8859/1 -$ LANG=es_AR.437 -643 Español (Argentina) - PC 437 -$ LANG=es_AR.850 -644 Español (Argentina) - PC 850 -$ LANG=es_CL -645 Español (Chile) - ISO 8859/1 -$ LANG=es_CL.437 -646 Español (Chile) - PC 437 -$ LANG=es_CL.850 -647 Español (Chile) - PC 850 -$ LANG=es_MX -648 Español (México) - ISO 8859/1 -$ LANG=es_MX.437 -649 Español (México) - PC 437 -$ LANG=es_MX.850 -650 Español (México) - PC 850 -$ LANG=es_VE -651 Español (Venezuela) - ISO 8859/1 -$ LANG=es_VE.437 -652 Español (Venezuela) - PC 437 -$ LANG=es_VE.850 -653 Español (Venezuela) - PC 850 -$ LANG=fi -654 Finlandés (Finlandia) - ISO 8859/1 -$ LANG=fi_FI.437 -655 Finlandés (Finlandia) - PC 437 -$ LANG=fi_FI.850 -656 Finlandés (Finlandia) - PC 850 -$ LANG=fr -657 Francés (Francia) - ISO 8859/1 -$ LANG=fr_FR.437 -658 Francés (Francia) - PC 437 -$ LANG=fr_FR.850 -659 Francés (Francia) - PC 850 -$ LANG=fr_BE -660 Francés (Bélgica) - ISO 8859/1 -$ LANG=fr_BE.437 -661 Francés (Bélgica) - PC 437 -$ LANG=fr_BE.850 -662 Francés (Bélgica) - PC 850 -$ LANG=fr_CA -663 Francés (Canadá) - ISO 8859/1 -$ LANG=fr_CA.850 -664 Francés (Canadá) - PC 850 -$ LANG=fr_CA.863 -665 Francés (Canadá) - PC 863 -$ LANG=fr_CH -666 Francés (Suiza) - ISO 8859/1 -$ LANG=fr_CH.437 -667 Francés (Suiza) - PC 437 -$ LANG=fr_CH.850 -668 Francés (Suiza) - PC 850 -$ LANG=is -669 Islandés (Islandia) - ISO 8859/1 -$ LANG=is_IS.850 -670 Islandés (Islandia) - PC 850 -$ LANG=it -671 Italiano (Italia) - ISO 8859/1 -$ LANG=it_IT.437 -672 Italiano (Italia) - PC 437 -$ LANG=it_IT.850 -673 Italiano (Italia) - PC 850 -$ LANG=it_CH -674 Italiano (Suiza) - ISO 8859/1 -$ LANG=it_CH.437 -675 Italiano (Suiza) - PC 437 -$ LANG=it_CH.850 -676 Italiano (Suiza) - PC 850 -$ LANG=ja -677 Japonés (Japón) - JIS X -$ LANG=ja_JP.EUC -678 Japonés (Japón) - JIS X -$ LANG=nl -679 Holandés (Holanda) - ISO 8859/1 -$ LANG=nl_NL.437 -680 Holandés (Holanda) - PC 437 -$ LANG=nl_NL.850 -681 Holandés (Holanda) - PC 850 -$ LANG=nl_BE -682 Holandés (Bélgica) - ISO 8859/1 -$ LANG=nl_BE.437 -683 Holandés (Bélgica) - PC 437 -$ LANG=nl_BE.850 -684 Holandés (Bélgica) - PC 850 -$ LANG=no -685 Noruego (Noruega) - ISO 8859/1 -$ LANG=no_NO.850 -686 Noruego (Noruega) - PC 850 -$ LANG=no_NO.865 -687 Noruego (Noruega) - PC 865 -$ LANG=pt -688 Portugués (Portugal) - ISO 8859/1 -$ LANG=pt_BR -689 Portugués (Brasil) - ISO 8859/1 -$ LANG=pt_PT.850 -690 Portugués (Portugal) - PC 850 -$ LANG=pt_PT.860 -691 Portugués (Portugal) - PC 860 -$ LANG=sv -692 Sueco (Suecia) - ISO 8859/1 -$ LANG=sv_SE.437 -693 Sueco (Suecia) - PC 437 -$ LANG=sv_SE.850 -694 Sueco (Suecia) - PC 850 diff --git a/cde/programs/localized/fr_FR.ISO8859-1/config/Xresources.tmsg b/cde/programs/localized/fr_FR.ISO8859-1/config/Xresources.tmsg index 594cb929..87d573b2 100644 --- a/cde/programs/localized/fr_FR.ISO8859-1/config/Xresources.tmsg +++ b/cde/programs/localized/fr_FR.ISO8859-1/config/Xresources.tmsg @@ -670,235 +670,3 @@ $ LANG=sl_SI.ISO8859-2 449 Slovène $ LANG=lt_LT.ISO8859-4 450 Lithuanien - -$ ---------------------------------------------------------------------------- -$ Login screen language list translations for USL (Novell) -$ -$ The following are the locale name to descriptive name mappings -$ for USL. When the login screen is displayed, the list of available -$ locales (valid values for $LANG) are obtained from the system. When -$ the language list menu is displayed on the login screen, the descriptive -$ text below is displayed rather than the locale name. -$ -$ For the translations below, the comment 'LANG=' provides the locale name -$ and the numbered item is the translatable descriptive text for that locale. -$ ---------------------------------------------------------------------------- - -$ LANG=C -600 US (US) - US ASCII -$ LANG=POSIX -601 US (US) - US ASCII -$ LANG=da -602 Danois (Danemark) - ISO 8859/1 -$ LANG=da_DK.850 -603 Danois (Danemark) - PC 850 -$ LANG=da_DK.865 -604 Danois (Danemark) - PC 865 -$ LANG=de -605 Allemand (Allemagne) - ISO 8859/1 -$ LANG=de_DE.437 -606 Allemand (Allemagne) - PC 437 -$ LANG=de_DE.850 -607 Allemand (Allemagne) - PC 850 -$ LANG=de_AT -608 Allemand (Autriche) - ISO 8859/1 -$ LANG=de_AT.437 -609 Allemand (Autriche) - PC 437 -$ LANG=de_AT.850 -610 Allemand (Autriche) - PC 850 -$ LANG=de_CH -611 Allemand (Suisse) - ISO 8859/1 -$ LANG=de_CH.437 -612 Allemand (Suisse) - PC 437 -$ LANG=de_CH.850 -613 Allemand (Suisse) - PC 850 -$ LANG=el -614 Grec (Grèce) - ISO 8859/7 - -$ LANG=en -$ 615 Anglais (Royaume-Uni) - ISO -$ 615 NEW- -615 English (United Kingdom) - ISO 8859/1 -$ LANG=en_GB.437 -$ 616 Anglais (Royaume-Uni) - PC -$ 616 NEW- -616 English (United Kingdom) - PC 437 -$ LANG=en_GB.646 -$ 617 Anglais (Royaume-Uni) - ISO -$ 617 NEW- -617 English (United Kingdom) - ISO 646 -$ LANG=en_GB.850 -$ 618 Anglais (Royaume-Uni) - PC -$ 618 NEW- -618 English (United Kingdom) - PC 850 - -$ LANG=en_AU -619 Anglais (Australie) - ISO 8859/1 -$ LANG=en_AU.437 -620 Anglais (Australie) - PC 437 -$ LANG=en_AU.646 -621 Anglais (Australie) - ISO 646 -$ LANG=en_AU.850 -622 Anglais (Australie) - PC 850 -$ LANG=en_CA -623 Anglais (Canada) - ISO 8859/1 -$ LANG=en_CA.437 -624 Anglais (Canada) - PC 437 -$ LANG=en_CA.646 -625 Anglais (Canada) - ISO 646 -$ LANG=en_CA.850 -626 Anglais (Canada) - PC 850 -$ LANG=en_IR -627 Anglais (Irelande) - ISO 8859/1 -$ LANG=en_IR.437 -628 Anglais (Irelande) - PC 437 -$ LANG=en_IR.850 -629 Anglais (Irelande) - PC 850 -$ LANG=en_IR.646 -630 Anglais (Irelande) - ISO 646 - -$ LANG=en_NZ -$ 631 Anglais (Nouvelle-Zélande) - ISO -$ 631 NEW- -631 English (New Zealand) - ISO 8859/1 -$ LANG=en_NZ.437 -$ 632 Anglais (Nouvelle-Zélande) PC -$ 632 NEW- -632 English (New Zealand) - PC 437 -$ LANG=en_NZ.850 -$ 633 Anglais (Nouvelle-Zélande) PC -$ 633 NEW- -633 English (New Zealand) - PC 850 -$ LANG=en_NZ.646 -$ 634 Anglais (Nouvelle-Zélande) PC -$ 634 NEW- -634 English (New Zealand) - PC 646 -$ LANG=en_US -$ 635 Anglais (Etats-Unis) - ISO -$ 635 NEW- -635 English (United States) - ISO 8859/1 -$ LANG=en_US.437 -$ 636 Anglais (Etats-Unis) PC -$ 636 NEW- -636 English (United States) - PC 437 -$ LANG=en_US.646 -$ 637 Anglais (Etats-Unis) ISO -$ 637 NEW- -637 English (United States) - ISO 646 -$ LANG=en_US.850 -$ 638 Anglais (Etats-Unis) PC -$ 638 NEW- -638 English (United States) - PC 850 - -$ LANG=es -639 Espagnol (Espagne) - ISO 8859/1 -$ LANG=es_ES.437 -640 Espagnol (Espagne) - PC 437 -$ LANG=es_ES.850 -641 Espagnol (Espagne) - PC 850 -$ LANG=es_AR -642 Espagnol (Argentine) - ISO 8859/1 -$ LANG=es_AR.437 -643 Espagnol (Argentine) - PC 437 -$ LANG=es_AR.850 -644 Espagnol (Argentine) - PC 850 -$ LANG=es_CL -645 Espagnol (Chili) - ISO 8859/1 -$ LANG=es_CL.437 -646 Espagnol (Chili) - PC 437 -$ LANG=es_CL.850 -647 Espagnol (Chili) - PC 850 -$ LANG=es_MX -648 Espagnol (Mexique) - ISO 8859/1 -$ LANG=es_MX.437 -649 Espagnol (Mexique) - PC 437 -$ LANG=es_MX.850 -650 Espagnol (Mexique) - PC 850 -$ LANG=es_VE -651 Espagnol (Vénézuela) - ISO 8859/1 -$ LANG=es_VE.437 -652 Espagnol (Vénézuela) - PC 437 -$ LANG=es_VE.850 -653 Espagnol (Vénézuela) - PC 850 -$ LANG=fi -654 Finnois (Finlande) - ISO 8859/1 -$ LANG=fi_FI.437 -655 Finnois (Finlande) - PC 437 -$ LANG=fi_FI.850 -656 Finnois (Finlande) - PC 850 -$ LANG=fr -657 Français (France) - ISO 8859/1 -$ LANG=fr_FR.437 -658 Français (France) - PC 437 -$ LANG=fr_FR.850 -659 Français (France) - PC 850 -$ LANG=fr_BE -660 Français (Belgique) - ISO 8859/1 -$ LANG=fr_BE.437 -661 Français (Belgique) - PC 437 -$ LANG=fr_BE.850 -662 Français (Belgique) - PC 850 -$ LANG=fr_CA -663 Français (Canada) - ISO 8859/1 -$ LANG=fr_CA.850 -664 Français (Canada) - PC 850 -$ LANG=fr_CA.863 -665 Français (Canada) - PC 863 -$ LANG=fr_CH -666 Français (Suisse) - ISO 8859/1 -$ LANG=fr_CH.437 -667 Français (Suisse) - PC 437 -$ LANG=fr_CH.850 -668 Français (Suisse) - PC 850 -$ LANG=is -669 Icelandais (Icelande) - ISO 8859/1 -$ LANG=is_IS.850 -670 Icelandais (Icelande) - PC 850 -$ LANG=it -671 Italien (Italie) - ISO 8859/1 -$ LANG=it_IT.437 -672 Italien (Italie) - PC 437 -$ LANG=it_IT.850 -673 Italien (Italie) - PC 850 -$ LANG=it_CH -674 Italien (Suisse) - ISO 8859/1 -$ LANG=it_CH.437 -675 Italien (Suisse) - PC 437 -$ LANG=it_CH.850 -676 Italien (Suisse) - PC 850 -$ LANG=ja -677 Japonais (Japon) - JIS X -$ LANG=ja_JP.EUC -678 Japonais (Japon) - JIS X -$ LANG=nl -679 Néerlandais (Pays-Bas) - ISO 8859/1 -$ LANG=nl_NL.437 -680 Néerlandais (Pays-Bas) - PC 437 -$ LANG=nl_NL.850 -681 Néerlandais (Pays-Bas) - PC 850 -$ LANG=nl_BE -682 Néerlandais (Belgique) - ISO 8859/1 -$ LANG=nl_BE.437 -683 Néerlandais (Belgique) - PC 437 -$ LANG=nl_BE.850 -684 Néerlandais (Belgique) - PC 850 -$ LANG=no -685 Norvégien (Norvège) - ISO 8859/1 -$ LANG=no_NO.850 -686 Norvégien (Norvège) - PC 850 -$ LANG=no_NO.865 -687 Norvégien (Norvège) - PC 865 -$ LANG=pt -688 Portuguais (Portugal) - ISO 8859/1 -$ LANG=pt_BR -689 Portuguais (Brésil) - ISO 8859/1 -$ LANG=pt_PT.850 -690 Portuguais (Portugal) - PC 850 -$ LANG=pt_PT.860 -691 Portuguais (Portugal) - PC 860 -$ LANG=sv -692 Suédois (Suède) - ISO 8859/1 -$ LANG=sv_SE.437 -693 Suédois (Suède) - PC 437 -$ LANG=sv_SE.850 -694 Suédois (Suède) - PC 850 diff --git a/cde/programs/localized/it_IT.ISO8859-1/config/Xresources.tmsg b/cde/programs/localized/it_IT.ISO8859-1/config/Xresources.tmsg index 3e3d9e41..3de9b555 100644 --- a/cde/programs/localized/it_IT.ISO8859-1/config/Xresources.tmsg +++ b/cde/programs/localized/it_IT.ISO8859-1/config/Xresources.tmsg @@ -529,236 +529,3 @@ $ LANG=sl_SI.ISO8859-2 449 Sloveno $ LANG=lt_LT.ISO8859-4 450 Lituano - - -$ ---------------------------------------------------------------------------- -$ Login screen language list translations for USL (Novell) -$ -$ The following are the locale name to descriptive name mappings -$ for USL. When the login screen is displayed, the list of available -$ locales (valid values for $LANG) are obtained from the system. When -$ the language list menu is displayed on the login screen, the descriptive -$ text below is displayed rather than the locale name. -$ -$ For the translations below, the comment 'LANG=' provides the locale name -$ and the numbered item is the translatable descriptive text for that locale. -$ ---------------------------------------------------------------------------- - -$ LANG=C -600 US (US) - US ASCII -$ LANG=POSIX -601 US (US) - US ASCII -$ LANG=da -602 Danese (Danimarca) - ISO 8859/1 -$ LANG=da_DK.850 -603 Danese (Danimarca) - PC 850 -$ LANG=da_DK.865 -604 Danese (Danimarca) - PC 865 -$ LANG=de -605 Tedesco (Germania) - ISO 8859/1 -$ LANG=de_DE.437 -606 Tedesco (Germania) - PC 437 -$ LANG=de_DE.850 -607 Tedesco (Germania) - PC 850 -$ LANG=de_AT -608 Tedesco (Austria) - ISO 8859/1 -$ LANG=de_AT.437 -609 Tedesco (Austria) - PC 437 -$ LANG=de_AT.850 -610 Tedesco (Austria) - PC 850 -$ LANG=de_CH -611 Tedesco (Svizzera) - ISO 8859/1 -$ LANG=de_CH.437 -612 Tedesco (Svizzera) - PC 437 -$ LANG=de_CH.850 -613 Tedesco (Svizzera) - PC 850 -$ LANG=el -614 Greco (Grecia) - ISO 8859/7 - -$ LANG=en -$ 615 Inglese (Regno Unito) - ISO -$ 615 NEW- -615 English (United Kingdom) - ISO 8859/1 -$ LANG=en_GB.437 -$ 616 Inglese (Regno Unito) - PC -$ 616 NEW- -616 English (United Kingdom) - PC 437 -$ LANG=en_GB.646 -$ 617 Inglese (Regno Unito) - ISO -$ 617 NEW- -617 English (United Kingdom) - ISO 646 -$ LANG=en_GB.850 -$ 618 Inglese (Regno Unito) - PC -$ 618 NEW- -618 English (United Kingdom) - PC 850 - -$ LANG=en_AU -619 Inglese (Australia) - ISO 8859/1 -$ LANG=en_AU.437 -620 Inglese (Australia) - PC 437 -$ LANG=en_AU.646 -621 Inglese (Australia) - ISO 646 -$ LANG=en_AU.850 -622 Inglese (Australia) - PC 850 -$ LANG=en_CA -623 Inglese (Canada) - ISO 8859/1 -$ LANG=en_CA.437 -624 Inglese (Canada) - PC 437 -$ LANG=en_CA.646 -625 Inglese (Canada) - ISO 646 -$ LANG=en_CA.850 -626 Inglese (Canada) - PC 850 -$ LANG=en_IR -627 Inglese (Irlanda) - ISO 8859/1 -$ LANG=en_IR.437 -628 Inglese (Irlanda) - PC 437 -$ LANG=en_IR.850 -629 Inglese (Irlanda) - PC 850 -$ LANG=en_IR.646 -630 Inglese (Irlanda) - ISO 646 - -$ LANG=en_NZ -$ 631 Inglese (Nuova Zelanda) - ISO -$ 631 NEW- -631 English (New Zealand) - ISO 8859/1 -$ LANG=en_NZ.437 -$ 632 Inglese (Nuova Zelanda) - PC -$ 632 NEW- -632 English (New Zealand) - PC 437 -$ LANG=en_NZ.850 -$ 633 Inglese (Nuova Zelanda) - PC -$ 633 NEW- -633 English (New Zealand) - PC 850 -$ LANG=en_NZ.646 -$ 634 Inglese (Nuova Zelanda) - PC -$ 634 NEW- -634 English (New Zealand) - PC 646 -$ LANG=en_US -$ 635 Inglese (U.S.A.) - ISO -$ 635 NEW- -635 English (United States) - ISO 8859/1 -$ LANG=en_US.437 -$ 636 Inglese (U.S.A.) - PC -$ 636 NEW- -636 English (United States) - PC 437 -$ LANG=en_US.646 -$ 637 Inglese (U.S.A.) - ISO -$ 637 NEW- -637 English (United States) - ISO 646 -$ LANG=en_US.850 -$ 638 Inglese (U.S.A.) - PC -$ 638 NEW- -638 English (United States) - PC 850 - -$ LANG=es -639 Spagnolo (Spagna) - ISO 8859/1 -$ LANG=es_ES.437 -640 Spagnolo (Spagna) - PC 437 -$ LANG=es_ES.850 -641 Spagnolo (Spagna) - PC 850 -$ LANG=es_AR -642 Spagnolo (Argentina) - ISO 8859/1 -$ LANG=es_AR.437 -643 Spagnolo (Argentina) - PC 437 -$ LANG=es_AR.850 -644 Spagnolo (Argentina) - PC 850 -$ LANG=es_CL -645 Spagnolo (Cile) - ISO 8859/1 -$ LANG=es_CL.437 -646 Spagnolo (Cile) - PC 437 -$ LANG=es_CL.850 -647 Spagnolo (Cile) - PC 850 -$ LANG=es_MX -648 Spagnolo (Messico) - ISO 8859/1 -$ LANG=es_MX.437 -649 Spagnolo (Messico) - PC 437 -$ LANG=es_MX.850 -650 Spagnolo (Messico) - PC 850 -$ LANG=es_VE -651 Spagnolo (Venezuela) - ISO 8859/1 -$ LANG=es_VE.437 -652 Spagnolo (Venezuela) - PC 437 -$ LANG=es_VE.850 -653 Spagnolo (Venezuela) - PC 850 -$ LANG=fi -654 Finlandese (Finlandia) - ISO 8859/1 -$ LANG=fi_FI.437 -655 Finlandese (Finlandia) - PC 437 -$ LANG=fi_FI.850 -656 Finlandese (Finlandia) - PC 850 -$ LANG=fr -657 Francese (Francia) - ISO 8859/1 -$ LANG=fr_FR.437 -658 Francese (Francia) - PC 437 -$ LANG=fr_FR.850 -659 Francese (Francia) - PC 850 -$ LANG=fr_BE -660 Francese (Belgio) - ISO 8859/1 -$ LANG=fr_BE.437 -661 Francese (Belgio) - PC 437 -$ LANG=fr_BE.850 -662 Francese (Belgio) - PC 850 -$ LANG=fr_CA -663 Francese (Canada) - ISO 8859/1 -$ LANG=fr_CA.850 -664 Francese (Canada) - PC 850 -$ LANG=fr_CA.863 -665 Francese (Canada) - PC 863 -$ LANG=fr_CH -666 Francese (Svizzera) - ISO 8859/1 -$ LANG=fr_CH.437 -667 Francese (Svizzera) - PC 437 -$ LANG=fr_CH.850 -668 Francese (Svizzera) - PC 850 -$ LANG=is -669 Islandese (Islanda) - ISO 8859/1 -$ LANG=is_IS.850 -670 Islandese (Islanda) - PC 850 -$ LANG=it -671 Italiano (Italia) - ISO 8859/1 -$ LANG=it_IT.437 -672 Italiano (Italia) - PC 437 -$ LANG=it_IT.850 -673 Italiano (Italia) - PC 850 -$ LANG=it_CH -674 Italiano (Svizzera) - ISO 8859/1 -$ LANG=it_CH.437 -675 Italiano (Svizzera) - PC 437 -$ LANG=it_CH.850 -676 Italiano (Svizzera) - PC 850 -$ LANG=ja -677 Giapponese (Giappone) - JIS X -$ LANG=ja_JP.EUC -678 Giapponese (Giappone) - JIS X -$ LANG=nl -679 Olandese (Paesi Bassi) - ISO 8859/1 -$ LANG=nl_NL.437 -680 Olandese (Paesi Bassi) - PC 437 -$ LANG=nl_NL.850 -681 Olandese (Paesi Bassi) - PC 850 -$ LANG=nl_BE -682 Olandese (Belgio) - ISO 8859/1 -$ LANG=nl_BE.437 -683 Olandese (Belgio) - PC 437 -$ LANG=nl_BE.850 -684 Olandese (Belgio) - PC 850 -$ LANG=no -685 Norvegese (Norvegia) - ISO 8859/1 -$ LANG=no_NO.850 -686 Norvegese (Norvegia) - PC 850 -$ LANG=no_NO.865 -687 Norvegese (Norvegia) - PC 865 -$ LANG=pt -688 Portoghese (Portogallo) - ISO 8859/1 -$ LANG=pt_BR -689 Portoghese (Brasile) - ISO 8859/1 -$ LANG=pt_PT.850 -690 Portoghese (Portogallo) - PC 850 -$ LANG=pt_PT.860 -691 Portoghese (Portogallo) - PC 860 -$ LANG=sv -692 Svedese (Svezzia) - ISO 8859/1 -$ LANG=sv_SE.437 -693 Svedese (Svezzia) - PC 437 -$ LANG=sv_SE.850 -694 Svedese (Svezzia) - PC 850 diff --git a/cde/programs/localized/ja_JP.dt-eucJP/config/Xresources.tmsg b/cde/programs/localized/ja_JP.dt-eucJP/config/Xresources.tmsg index 74623da8..ad2d29ed 100644 --- a/cde/programs/localized/ja_JP.dt-eucJP/config/Xresources.tmsg +++ b/cde/programs/localized/ja_JP.dt-eucJP/config/Xresources.tmsg @@ -611,320 +611,3 @@ $ "NEW-" $ LANG=lt_LT.ISO8859-4 $ "NEW-" 450 ¥ê¥È¥¢¥Ë¥¢¸ì - -$ ---------------------------------------------------------------------------- -$ Login screen language list translations for USL (Novell) -$ -$ The following are the locale name to descriptive name mappings -$ for USL. When the login screen is displayed, the list of available -$ locales (valid values for $LANG) are obtained from the system. When -$ "NEW-" -$ the language list menu is displayed on the login screen, the descriptive -$ text below is displayed rather than the locale name. -$ -$ For the translations below, the comment 'LANG=' provides the locale name -$ "NEW-" -$ and the numbered item is the translatable descriptive text for that locale. -$ ---------------------------------------------------------------------------- - -$ LANG=C -$ "NEW-" -600 ±Ñ¸ì (¥¢¥á¥ê¥«) - US ASCII -$ LANG=POSIX -$ "NEW-" -601 ±Ñ¸ì (¥¢¥á¥ê¥«) - US ASCII -$ LANG=da -$ "NEW-" -602 ¥Ç¥ó¥Þ¡¼¥¯¸ì (¥Ç¥ó¥Þ¡¼¥¯) - ISO 8859/1 -$ LANG=da_DK.850 -$ "NEW-" -603 ¥Ç¥ó¥Þ¡¼¥¯¸ì (¥Ç¥ó¥Þ¡¼¥¯) - PC 850 -$ LANG=da_DK.865 -$ "NEW-" -604 ¥Ç¥ó¥Þ¡¼¥¯¸ì (¥Ç¥ó¥Þ¡¼¥¯) - PC 865 -$ LANG=de -$ "NEW-" -605 ¥É¥¤¥Ä¸ì (¥É¥¤¥Ä) - ISO 8859/1 -$ LANG=de_DE.437 -$ "NEW-" -606 ¥É¥¤¥Ä¸ì (¥É¥¤¥Ä) - PC 437 -$ LANG=de_DE.850 -$ "NEW-" -607 ¥É¥¤¥Ä¸ì (¥É¥¤¥Ä) - PC 850 -$ LANG=de_AT -$ "NEW-" -608 ¥É¥¤¥Ä¸ì (¥ª¡¼¥¹¥È¥ê¥¢) - ISO 8859/1 -$ LANG=de_AT.437 -$ "NEW-" -609 ¥É¥¤¥Ä¸ì (¥ª¡¼¥¹¥È¥ê¥¢) - PC 437 -$ LANG=de_AT.850 -$ "NEW-" -610 ¥É¥¤¥Ä¸ì (¥ª¡¼¥¹¥È¥ê¥¢) - PC 850 -$ LANG=de_CH -$ "NEW-" -611 ¥É¥¤¥Ä¸ì (¥¹¥¤¥¹) - ISO 8859/1 -$ LANG=de_CH.437 -$ "NEW-" -612 ¥É¥¤¥Ä¸ì (¥¹¥¤¥¹) - PC 437 -$ LANG=de_CH.850 -$ "NEW-" -613 ¥É¥¤¥Ä¸ì (¥¹¥¤¥¹) - PC 850 -$ LANG=el -$ "NEW-" -614 ¥®¥ê¥·¥ã¸ì (¥®¥ê¥·¥ã) - ISO 8859/7 - -$ LANG=en -$ 615 ±Ñ¸ì (¥¤¥®¥ê¥¹) - Kingdom ISO -$ 615 NEW- -615 English (United Kingdom) - ISO 8859/1 -$ LANG=en_GB.437 -$ 616 ±Ñ¸ì (¥¤¥®¥ê¥¹) - Kingdom PC -$ 616 NEW- -616 English (United Kingdom) - PC 437 -$ LANG=en_GB.646 -$ 617 ±Ñ¸ì (¥¤¥®¥ê¥¹) - Kingdom ISO -$ 617 NEW- -617 English (United Kingdom) - ISO 646 -$ LANG=en_GB.850 -$ 618 ±Ñ¸ì (¥¤¥®¥ê¥¹) - Kingdom PC -$ 618 NEW- -618 English (United Kingdom) - PC 850 - -$ LANG=en_AU -$ "NEW-" -619 ±Ñ¸ì (¥ª¡¼¥¹¥È¥é¥ê¥¢) - ISO 8859/1 -$ LANG=en_AU.437 -$ "NEW-" -620 ±Ñ¸ì (¥ª¡¼¥¹¥È¥é¥ê¥¢) - PC 437 -$ LANG=en_AU.646 -$ "NEW-" -621 ±Ñ¸ì (¥ª¡¼¥¹¥È¥é¥ê¥¢) - ISO 646 -$ LANG=en_AU.850 -$ "NEW-" -622 ±Ñ¸ì (¥ª¡¼¥¹¥È¥é¥ê¥¢) - PC 850 -$ LANG=en_CA -$ "NEW-" -623 ±Ñ¸ì (¥«¥Ê¥À) - ISO 8859/1 -$ LANG=en_CA.437 -$ "NEW-" -624 ±Ñ¸ì (¥«¥Ê¥À) - PC 437 -$ LANG=en_CA.646 -$ "NEW-" -625 ±Ñ¸ì (¥«¥Ê¥À) - ISO 646 -$ LANG=en_CA.850 -$ "NEW-" -626 ±Ñ¸ì (¥«¥Ê¥À) - PC 850 -$ LANG=en_IR -$ "NEW-" -627 ±Ñ¸ì (¥¢¥¤¥ë¥é¥ó¥É) - ISO 8859/1 -$ LANG=en_IR.437 -$ "NEW-" -628 ±Ñ¸ì (¥¢¥¤¥ë¥é¥ó¥É) - PC 437 -$ LANG=en_IR.850 -$ "NEW-" -629 ±Ñ¸ì (¥¢¥¤¥ë¥é¥ó¥É) - PC 850 -$ LANG=en_IR.646 -$ "NEW-" -630 ±Ñ¸ì (¥¢¥¤¥ë¥é¥ó¥É) - ISO 646 - -$ LANG=en_NZ -$ 631 ±Ñ¸ì (¥Ë¥å¡¼¥¸¡¼¥é¥ó¥É) - Zealand ISO -$ 631 NEW- -631 English (New Zealand) - ISO 8859/1 -$ LANG=en_NZ.437 -$ 632 ±Ñ¸ì (¥Ë¥å¡¼¥¸¡¼¥é¥ó¥É) - Zealand PC -$ 632 NEW- -632 English (New Zealand) - PC 437 -$ LANG=en_NZ.850 -$ 633 ±Ñ¸ì (¥Ë¥å¡¼¥¸¡¼¥é¥ó¥É) - Zealand PC -$ 633 NEW- -633 English (New Zealand) - PC 850 -$ LANG=en_NZ.646 -$ 634 ±Ñ¸ì (¥Ë¥å¡¼¥¸¡¼¥é¥ó¥É) - Zealand PC -$ 634 NEW- -634 English (New Zealand) - PC 646 -$ LANG=en_US -$ 635 ±Ñ¸ì (¥¤¥®¥ê¥¹) - States ISO -$ 635 NEW- -635 English (United States) - ISO 8859/1 -$ LANG=en_US.437 -$ 636 ±Ñ¸ì (¥¤¥®¥ê¥¹) - States PC -$ 636 NEW- -636 English (United States) - PC 437 -$ LANG=en_US.646 -$ 637 ±Ñ¸ì (¥¤¥®¥ê¥¹) - States ISO -$ 637 NEW- -637 English (United States) - ISO 646 -$ LANG=en_US.850 -$ 638 ±Ñ¸ì (¥¤¥®¥ê¥¹) - States PC -$ 638 NEW- -638 English (United States) - PC 850 - -$ LANG=es -$ "NEW-" -639 ¥¹¥Ú¥¤¥ó¸ì (¥¹¥Ú¥¤¥ó) - ISO 8859/1 -$ LANG=es_ES.437 -$ "NEW-" -640 ¥¹¥Ú¥¤¥ó¸ì (¥¹¥Ú¥¤¥ó) - PC 437 -$ LANG=es_ES.850 -$ "NEW-" -641 ¥¹¥Ú¥¤¥ó¸ì (¥¹¥Ú¥¤¥ó) - PC 850 -$ LANG=es_AR -$ "NEW-" -642 ¥¹¥Ú¥¤¥ó¸ì (¥¢¥ë¥¼¥ó¥Á¥ó) - ISO 8859/1 -$ LANG=es_AR.437 -$ "NEW-" -643 ¥¹¥Ú¥¤¥ó¸ì (¥¢¥ë¥¼¥ó¥Á¥ó) - PC 437 -$ LANG=es_AR.850 -$ "NEW-" -644 ¥¹¥Ú¥¤¥ó¸ì (¥¢¥ë¥¼¥ó¥Á¥ó) - PC 850 -$ LANG=es_CL -$ "NEW-" -645 ¥¹¥Ú¥¤¥ó¸ì (¥Á¥ê) - ISO 8859/1 -$ LANG=es_CL.437 -$ "NEW-" -646 ¥¹¥Ú¥¤¥ó¸ì (¥Á¥ê) - PC 437 -$ LANG=es_CL.850 -$ "NEW-" -647 ¥¹¥Ú¥¤¥ó¸ì (¥Á¥ê) - PC 850 -$ LANG=es_MX -$ "NEW-" -648 ¥¹¥Ú¥¤¥ó¸ì (¥á¥­¥·¥³) - ISO 8859/1 -$ LANG=es_MX.437 -$ "NEW-" -649 ¥¹¥Ú¥¤¥ó¸ì (¥á¥­¥·¥³) - PC 437 -$ LANG=es_MX.850 -$ "NEW-" -650 ¥¹¥Ú¥¤¥ó¸ì (¥á¥­¥·¥³) - PC 850 -$ LANG=es_VE -$ "NEW-" -651 ¥¹¥Ú¥¤¥ó¸ì (¥Ù¥Í¥º¥¨¥é) - ISO 8859/1 -$ LANG=es_VE.437 -$ "NEW-" -652 ¥¹¥Ú¥¤¥ó¸ì (¥Ù¥Í¥º¥¨¥é) - PC 437 -$ LANG=es_VE.850 -$ "NEW-" -653 ¥¹¥Ú¥¤¥ó¸ì (¥Ù¥Í¥º¥¨¥é) - PC 850 -$ LANG=fi -$ "NEW-" -654 ¥Õ¥£¥ó¸ì (¥Õ¥£¥ó¥é¥ó¥É) - ISO 8859/1 -$ LANG=fi_FI.437 -$ "NEW-" -655 ¥Õ¥£¥ó¸ì (¥Õ¥£¥ó¥é¥ó¥É) - PC 437 -$ LANG=fi_FI.850 -$ "NEW-" -656 ¥Õ¥£¥ó¸ì (¥Õ¥£¥ó¥é¥ó¥É) - PC 850 -$ LANG=fr -$ "NEW-" -657 ¥Õ¥é¥ó¥¹¸ì (¥Õ¥é¥ó¥¹) - ISO 8859/1 -$ LANG=fr_FR.437 -$ "NEW-" -658 ¥Õ¥é¥ó¥¹¸ì (¥Õ¥é¥ó¥¹) - PC 437 -$ LANG=fr_FR.850 -$ "NEW-" -659 ¥Õ¥é¥ó¥¹¸ì (¥Õ¥é¥ó¥¹) - PC 850 -$ LANG=fr_BE -$ "NEW-" -660 ¥Õ¥é¥ó¥¹¸ì (¥Ù¥ë¥®¡¼) - ISO 8859/1 -$ LANG=fr_BE.437 -$ "NEW-" -661 ¥Õ¥é¥ó¥¹¸ì (¥Ù¥ë¥®¡¼) - PC 437 -$ LANG=fr_BE.850 -$ "NEW-" -662 ¥Õ¥é¥ó¥¹¸ì (¥Ù¥ë¥®¡¼) - PC 850 -$ LANG=fr_CA -$ "NEW-" -663 ¥Õ¥é¥ó¥¹¸ì (¥«¥Ê¥À) - ISO 8859/1 -$ LANG=fr_CA.850 -$ "NEW-" -664 ¥Õ¥é¥ó¥¹¸ì (¥«¥Ê¥À) - PC 850 -$ LANG=fr_CA.863 -$ "NEW-" -665 ¥Õ¥é¥ó¥¹¸ì (¥«¥Ê¥À) - PC 863 -$ LANG=fr_CH -$ "NEW-" -666 ¥Õ¥é¥ó¥¹¸ì (¥¹¥¤¥¹) - ISO 8859/1 -$ LANG=fr_CH.437 -$ "NEW-" -667 ¥Õ¥é¥ó¥¹¸ì (¥¹¥¤¥¹) - PC 437 -$ LANG=fr_CH.850 -$ "NEW-" -668 ¥Õ¥é¥ó¥¹¸ì (¥¹¥¤¥¹) - PC 850 -$ LANG=is -$ "NEW-" -669 ¥¢¥¤¥¹¥é¥ó¥É¸ì (¥¢¥¤¥¹¥é¥ó¥É) - ISO 8859/1 -$ LANG=is_IS.850 -$ "NEW-" -670 ¥¢¥¤¥¹¥é¥ó¥É¸ì (¥¢¥¤¥¹¥é¥ó¥É) - PC 850 -$ LANG=it -$ "NEW-" -671 ¥¤¥¿¥ê¥¢¸ì (¥¤¥¿¥ê¥¢) - ISO 8859/1 -$ LANG=it_IT.437 -$ "NEW-" -672 ¥¤¥¿¥ê¥¢¸ì (¥¤¥¿¥ê¥¢) - PC 437 -$ LANG=it_IT.850 -$ "NEW-" -673 ¥¤¥¿¥ê¥¢¸ì (¥¤¥¿¥ê¥¢) - PC 850 -$ LANG=it_CH -$ "NEW-" -674 ¥¤¥¿¥ê¥¢¸ì (¥¹¥¤¥¹) - ISO 8859/1 -$ LANG=it_CH.437 -$ "NEW-" -675 ¥¤¥¿¥ê¥¢¸ì (¥¹¥¤¥¹) - PC 437 -$ LANG=it_CH.850 -$ "NEW-" -676 ¥¤¥¿¥ê¥¢¸ì (¥¹¥¤¥¹) - PC 850 -$ LANG=ja -$ "NEW-" -677 ÆüËܸì (ÆüËÜ) - JIS X -$ LANG=ja_JP.EUC -$ "NEW-" -678 ÆüËܸì (ÆüËÜ) - JIS X -$ LANG=nl -$ "NEW-" -679 ¥ª¥é¥ó¥À¸ì (¥ª¥é¥ó¥À) - ISO 8859/1 -$ LANG=nl_NL.437 -$ "NEW-" -680 ¥ª¥é¥ó¥À¸ì (¥ª¥é¥ó¥À) - PC 437 -$ LANG=nl_NL.850 -$ "NEW-" -681 ¥ª¥é¥ó¥À¸ì (¥ª¥é¥ó¥À) - PC 850 -$ LANG=nl_BE -$ "NEW-" -682 ¥ª¥é¥ó¥À¸ì (¥Ù¥ë¥®¡¼) - ISO 8859/1 -$ LANG=nl_BE.437 -$ "NEW-" -683 ¥ª¥é¥ó¥À¸ì (¥Ù¥ë¥®¡¼) - PC 437 -$ LANG=nl_BE.850 -$ "NEW-" -684 ¥ª¥é¥ó¥À¸ì (¥Ù¥ë¥®¡¼) - PC 850 -$ LANG=no -$ "NEW-" -685 ¥Î¥ë¥¦¥§¡¼¸ì (¥Î¥ë¥¦¥§¡¼) - ISO 8859/1 -$ LANG=no_NO.850 -$ "NEW-" -686 ¥Î¥ë¥¦¥§¡¼¸ì (¥Î¥ë¥¦¥§¡¼) - PC 850 -$ LANG=no_NO.865 -$ "NEW-" -687 ¥Î¥ë¥¦¥§¡¼¸ì (¥Î¥ë¥¦¥§¡¼) - PC 865 -$ LANG=pt -$ "NEW-" -688 ¥Ý¥ë¥È¥¬¥ë¸ì (¥Ý¥ë¥È¥¬¥ë) - ISO 8859/1 -$ LANG=pt_BR -$ "NEW-" -689 ¥Ý¥ë¥È¥¬¥ë¸ì (¥Ö¥é¥¸¥ë) - ISO 8859/1 -$ LANG=pt_PT.850 -$ "NEW-" -690 ¥Ý¥ë¥È¥¬¥ë¸ì (¥Ý¥ë¥È¥¬¥ë) - PC 850 -$ LANG=pt_PT.860 -$ "NEW-" -691 ¥Ý¥ë¥È¥¬¥ë¸ì (¥Ý¥ë¥È¥¬¥ë) - PC 860 -$ LANG=sv -$ "NEW-" -692 ¥¹¥¦¥§¡¼¥Ç¥ó¸ì (¥¹¥¦¥§¡¼¥Ç¥ó) - ISO 8859/1 -$ LANG=sv_SE.437 -$ "NEW-" -693 ¥¹¥¦¥§¡¼¥Ç¥ó¸ì (¥¹¥¦¥§¡¼¥Ç¥ó) - PC 437 -$ LANG=sv_SE.850 -$ "NEW-" -694 ¥¹¥¦¥§¡¼¥Ç¥ó¸ì (¥¹¥¦¥§¡¼¥Ç¥ó) - PC 850 diff --git a/cde/programs/localized/templates/Chinese.tmpl b/cde/programs/localized/templates/Chinese.tmpl index da0b95a5..d63574e8 100644 --- a/cde/programs/localized/templates/Chinese.tmpl +++ b/cde/programs/localized/templates/Chinese.tmpl @@ -22,7 +22,3 @@ LANG=zh #ifdef HPArchitecture LANG=zh_CN.hp15CN #endif - -#ifdef USLArchitecture -LANG=zh_CN -#endif diff --git a/cde/programs/localized/templates/French.tmpl b/cde/programs/localized/templates/French.tmpl index d1dbbf0c..ebb2063e 100644 --- a/cde/programs/localized/templates/French.tmpl +++ b/cde/programs/localized/templates/French.tmpl @@ -23,10 +23,6 @@ LANG=fr LANG=fr_FR.iso88591 #endif -#ifdef USLArchitecture -LANG=fr -#endif - #if defined(LinuxArchitecture) || defined(BSDArchitecture) LANG=fr_FR.ISO8859-1 #endif diff --git a/cde/programs/localized/templates/German.tmpl b/cde/programs/localized/templates/German.tmpl index 6a91e468..cc182b53 100644 --- a/cde/programs/localized/templates/German.tmpl +++ b/cde/programs/localized/templates/German.tmpl @@ -23,10 +23,6 @@ LANG=de LANG=de_DE.iso88591 #endif -#ifdef USLArchitecture -LANG=de -#endif - #if defined(LinuxArchitecture) || defined(BSDArchitecture) LANG=de_DE.ISO8859-1 #endif diff --git a/cde/programs/localized/templates/Italian.tmpl b/cde/programs/localized/templates/Italian.tmpl index 9ef4e904..afb77531 100644 --- a/cde/programs/localized/templates/Italian.tmpl +++ b/cde/programs/localized/templates/Italian.tmpl @@ -23,10 +23,6 @@ LANG=it LANG=it_IT.iso88591 #endif -#ifdef USLArchitecture -LANG=it -#endif - #if defined(LinuxArchitecture) || defined(BSDArchitecture) LANG=it_IT.ISO8859-1 #endif diff --git a/cde/programs/localized/templates/Japanese.tmpl b/cde/programs/localized/templates/Japanese.tmpl index de8ca5b7..35b6ae3f 100644 --- a/cde/programs/localized/templates/Japanese.tmpl +++ b/cde/programs/localized/templates/Japanese.tmpl @@ -22,7 +22,3 @@ LANG=ja #ifdef HPArchitecture LANG=ja_JP.eucJP #endif - -#ifdef USLArchitecture -LANG=ja -#endif diff --git a/cde/programs/localized/templates/Korean.tmpl b/cde/programs/localized/templates/Korean.tmpl index d5506c00..a807dbc7 100644 --- a/cde/programs/localized/templates/Korean.tmpl +++ b/cde/programs/localized/templates/Korean.tmpl @@ -22,7 +22,3 @@ LANG=ko #ifdef HPArchitecture LANG=ko_KR.eucKR #endif - -#ifdef USLArchitecture -LANG=ko -#endif diff --git a/cde/programs/localized/templates/Spanish.tmpl b/cde/programs/localized/templates/Spanish.tmpl index 5809a8f6..3122a74c 100644 --- a/cde/programs/localized/templates/Spanish.tmpl +++ b/cde/programs/localized/templates/Spanish.tmpl @@ -23,10 +23,6 @@ LANG=es LANG=es_ES.iso88591 #endif -#ifdef USLArchitecture -LANG=es -#endif - #if defined(LinuxArchitecture) || defined(BSDArchitecture) LANG=es_ES.ISO8859-1 #endif diff --git a/cde/programs/localized/templates/Swedish.tmpl b/cde/programs/localized/templates/Swedish.tmpl index fb2ec163..19d6b029 100644 --- a/cde/programs/localized/templates/Swedish.tmpl +++ b/cde/programs/localized/templates/Swedish.tmpl @@ -22,7 +22,3 @@ LANG=sv #ifdef HPArchitecture LANG=sv_SE.iso88591 #endif - -#ifdef USLArchitecture -LANG=sv -#endif diff --git a/cde/programs/localized/templates/Taiwanese.tmpl b/cde/programs/localized/templates/Taiwanese.tmpl index 940dd6ef..630736db 100644 --- a/cde/programs/localized/templates/Taiwanese.tmpl +++ b/cde/programs/localized/templates/Taiwanese.tmpl @@ -22,7 +22,3 @@ LANG=zh_TW #ifdef HPArchitecture LANG=zh_TW.ccdc #endif - -#ifdef USLArchitecture -LANG=zh_TW -#endif diff --git a/cde/programs/localized/util/merge.c b/cde/programs/localized/util/merge.c index 3993e16f..b8b05dcd 100644 --- a/cde/programs/localized/util/merge.c +++ b/cde/programs/localized/util/merge.c @@ -242,11 +242,7 @@ void cat_open () if(pfile != NULL) { -#if defined(USL) - sprintf(line,"/usr/bin/gencat -m ./.dt_pfile.cat %s",pfile); -#else sprintf(line,"/usr/bin/gencat ./.dt_pfile.cat %s",pfile); -#endif if ( system(line) != 0 ) { fatal("primary .tmsg file would not gencat\n",0,9); @@ -257,11 +253,7 @@ void cat_open () if(dfile != NULL) { -#if defined(USL) - sprintf(line,"/usr/bin/gencat -m ./.dt_dfile.cat %s",dfile); -#else sprintf(line,"/usr/bin/gencat ./.dt_dfile.cat %s",dfile); -#endif if ( system(line) != 0 ) { fatal("default .tmsg file would not gencat\n",0,9); diff --git a/cde/programs/nsgmls/Imakefile b/cde/programs/nsgmls/Imakefile index e83d0bdb..c1084466 100644 --- a/cde/programs/nsgmls/Imakefile +++ b/cde/programs/nsgmls/Imakefile @@ -33,23 +33,6 @@ CXXTEMPLATEFLAGS = -ptf M4 = /bin/m4 #endif -#ifdef SCOArchitecture -/* put cpp directives here rather than in CXXDEFINES because - * for some reason the CXXDEFINES aren't passed to the link phase - * but they are needed there to instantiate templates - */ -CXXOPTIONS = \ - -DSP_VOLATILE= -DSP_CONST= \ - -DSP_HAVE_LOCALE -DSP_MULTI_BYTE -DSP_MANUAL_INST - -/* - * Flags passed into compile step when doing manual template instantiation. - */ -CXXTEMPLATEFLAGS = - -M4 = /bin/m4 -#endif - #ifdef HPArchitecture /* * make null pointer use invalid @@ -131,23 +114,6 @@ CXXTEMPLATEFLAGS = M4 = /usr/ccs/bin/m4 #endif /* SunArchitecture */ -#if defined(USLArchitecture) -/* put cpp directives here rather than in CXXDEFINES because - * for some reason the CXXDEFINES aren't passed to the link phase - * but they are needed there to instantiate templates - */ -CXXOPTIONS = \ - -DSP_VOLATILE= -DSP_CONST= \ - -DSP_HAVE_LOCALE -DSP_MULTI_BYTE -DSP_MANUAL_INST - -/* - * Flags passed into compile step when doing manual template instantiation. - */ -CXXTEMPLATEFLAGS = - -M4 = /bin/m4 -#endif - .SUFFIXES: .m4 .m4.C: rm -f $@ diff --git a/cde/programs/nsgmls/Ptr.h b/cde/programs/nsgmls/Ptr.h index 186ba1de..d8f2970a 100644 --- a/cde/programs/nsgmls/Ptr.h +++ b/cde/programs/nsgmls/Ptr.h @@ -73,22 +73,15 @@ private: }; template -#if defined (USL) -class ConstPtr : public Ptr { -#else class ConstPtr : private Ptr { -#endif public: ConstPtr() { } ConstPtr(T *ptr) : Ptr(ptr) { } ConstPtr(const Ptr &p) : Ptr(p) { } ConstPtr(const ConstPtr &p) : Ptr(p) { } -#if defined (USL) -#else ConstPtr &operator=(const Ptr &p) { Ptr::operator=(p); return *this; } -#endif ConstPtr &operator=(const ConstPtr &p) { Ptr::operator=(p); return *this; } diff --git a/cde/programs/nsgmls/instmac.m4 b/cde/programs/nsgmls/instmac.m4 index f41a9676..d22e1475 100644 --- a/cde/programs/nsgmls/instmac.m4 +++ b/cde/programs/nsgmls/instmac.m4 @@ -21,8 +21,6 @@ define(`__instantiate',`#if defined(__DECCXX) #pragma define_template $1 #elif defined(AIXV3) #pragma define($1) -#elif defined(USL) - #pragma instantiate $1 #elif defined(SP_ANSI_CLASS_INST) template class $1; #else diff --git a/cde/programs/ttsnoop/Imakefile b/cde/programs/ttsnoop/Imakefile index da4eb173..5f18a791 100644 --- a/cde/programs/ttsnoop/Imakefile +++ b/cde/programs/ttsnoop/Imakefile @@ -81,7 +81,6 @@ AB_MAKEFILES = \ Makefile.hpux \ Makefile.sunos \ Makefile.osf1 \ - Makefile.unixware \ Makefile.linux \ Makefile.freebsd \ Makefile.netbsd \ diff --git a/cde/programs/types/demo/Makefile.usl b/cde/programs/types/demo/Makefile.usl deleted file mode 100644 index d3a943b6..00000000 --- a/cde/programs/types/demo/Makefile.usl +++ /dev/null @@ -1,51 +0,0 @@ -# $XConsortium: Makefile.usl /main/2 1996/05/13 11:36:15 drk $ -########################################################################## -# -# Makefile for datatyping.c -# -# (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 Unix System Labs, Inc., a subsidiary of -# Novell, Inc. -########################################################################## - -#ifndef CDE_INSTALLATION_TOP - CDE_INSTALLATION_TOP = /usr/dt -#endif - -PROGRAM = datatyping -SOURCES = datatyping.c -OBJECTS = datatyping.o - -OPTIMIZEDFLAGS = -O - -DTINCLUDE = -I$(CDE_INSTALLATION_TOP)/include -#XMINCLUDE = -I$(CDE_INSTALLATION_TOP)/include -X11INCLUDE = -I/usr/X/include -INCLUDES = $(DTINCLUDE) $(XMINCLUDE) $(X11INCLUDE) - -DTSVCLIB = -L$(CDE_INSTALLATION_TOP)/lib -lDtSvc -TTLIB = -L$(CDE_INSTALLATION_TOP)/lib -ltt -XMLIB = -L$(CDE_INSTALLATION_TOP)/lib -lXm -XTLIB = -L/usr/X/lib -lXt -X11LIB = -L/usr/X/lib -lX11 -CPLUSPLUS = -L/usr/add-on/C++/lib -lC -EXTRA_LIBS = -L/usr/lib -lgen -lnsl -lresolv -lsocket -lXIM \ - -L/usr/add-on/C++/lib -lC - -LIBRARIES = $(DTSVCLIB) $(TTLIB) $(XMLIB) $(XTLIB) \ - $(X11LIB) $(CPLUSPLUS) $(EXTRA_LIBS) -LDFLAGS = - -.c.o: - cc -c $(OPTIMIZEDFLAGS) $(INCLUDES) $< - -all:: $(PROGRAM) - -$(PROGRAM):: $(OBJECTS) - cc -o $(PROGRAM) $(LDFLAGS) $(OBJECTS) $(LIBRARIES) - -clean:: - rm -f $(PROGRAM) - rm -f $(OBJECTS) diff --git a/cde/programs/util/dttypes/Imakefile b/cde/programs/util/dttypes/Imakefile index 1442f87f..33b7d957 100644 --- a/cde/programs/util/dttypes/Imakefile +++ b/cde/programs/util/dttypes/Imakefile @@ -11,20 +11,10 @@ SYS_LIBRARIES = -lm EXTRA_DEFINES = +e #endif -#ifdef SCOArchitecture -ATLIB= -SYS_LIBRARIES = -lm -lcrypt -#endif - #ifdef RsArchitecture ATLIB= #endif -#ifdef USLArchitecture -SYS_LIBRARIES = -lm -lgen -ATLIB= -#endif - #if defined(HPOSFArchitecture) #endif