Discontinue HPUX support

cde/.gitignore

@@ -242,7 +242,6 @@ programs/dtappbuilder/src/ab/.dtcodegen.log
 programs/dtappbuilder/src/ab/Dtbuilder
 programs/dtappbuilder/src/ab/Dtbuilder.BAK
 programs/dtappbuilder/src/ab/Makefile.aix
-programs/dtappbuilder/src/ab/Makefile.hpux
 programs/dtappbuilder/src/ab/Makefile.sunos
 programs/dtappbuilder/src/ab/Makefile.linux
 programs/dtappbuilder/src/ab/Makefile.freebsd
@@ -2105,7 +2104,6 @@ programs/nsgmls/xentmgr_inst.C
 # programs/ttsnoop
 programs/ttsnoop/.dtcodegen.log
 programs/ttsnoop/Makefile.aix
-programs/ttsnoop/Makefile.hpux
 programs/ttsnoop/Makefile.sunos
 programs/ttsnoop/Makefile.linux
 programs/ttsnoop/Makefile.freebsd

cde/configure.ac

@@ -61,7 +61,6 @@ build_freebsd=no
 build_openbsd=no
 build_netbsd=no
 build_solaris=no
-build_hpux=no
 build_aix=no
 
 dnl For now, we need to fake the OSMAJORVERSION, OSMINORVERSION.  In Linux
@@ -121,9 +120,6 @@ case "${build_os}" in
 	aix*)
 		build_aix=yes
 		;;
-	hpux*)
-		build_hpux=yes
-		;;
 esac
 
 AM_CONDITIONAL([LINUX], [test "$build_linux" = "yes"])
@@ -133,7 +129,6 @@ AM_CONDITIONAL([OPENBSD], [test "$build_openbsd" = "yes"])
 AM_CONDITIONAL([NETBSD], [test "$build_netbsd" = "yes"])
 AM_CONDITIONAL([SOLARIS], [test "$build_solaris" = "yes"])
 AM_CONDITIONAL([AIX], [test "$build_aix" = "yes"])
-AM_CONDITIONAL([HPUX], [test "$build_hpux" = "yes"])
 
 dnl Add osmajor/minor version to cppflags.
 OSVERSION="-DOSMAJORVERSION=$OSMAJORVERSION -DOSMINORVERSION=$OSMINORVERSION"

cde/examples/dtaction/Makefile.hp

@@ -1,45 +0,0 @@
-# $XConsortium: Makefile.hp /main/2 1996/05/13 11:42:21 drk $
-##########################################################################
-#
-#  Makefile for dtdts examples (HP)
-#
-#  (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		= -Aa -z $(DEFINES) $(CDEBUGFLAGS)
-
-DTINCLUDE	= -I/usr/dt/include
-X11INCLUDE	= -I/usr/include/X11R5
-
-INCLUDES	= $(DTINCLUDE) $(X11INCLUDE)
-
-DTLIBS		= -L/usr/dt/lib -lDtSvc -ltt -lXm
-X11LIBS		= -L/usr/lib/X11R5 -lXt -lX11
-SYSLIBS		=
-
-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)

cde/examples/dtcalendar/Makefile.hp

@@ -1,45 +0,0 @@
-# $XConsortium: Makefile.hp /main/2 1996/05/13 11:43:48 drk $
-##########################################################################
-#
-#  Makefile for dtcalendar examples (HP)
-#
-#  (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		= -Aa -z $(DEFINES) $(CDEBUGFLAGS)
-
-DTINCLUDE	= -I/usr/dt/include
-X11INCLUDE	=
-
-INCLUDES	= $(DTINCLUDE) $(X11INCLUDE)
-
-DTLIBS		= -L/usr/dt/lib -lcsa
-X11LIBS		=
-SYSLIBS		=
-
-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)

cde/examples/dtdnd/Makefile.hp

@@ -1,45 +0,0 @@
-# $XConsortium: Makefile.hp /main/2 1996/05/13 11:45:18 drk $
-##########################################################################
-#
-#  Makefile for dtdnddemo
-#
-#	HP 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		= -D_HPUX_SOURCE
-CDEBUGFLAGS	= -O
-CFLAGS		= -Aa -z $(DEFINES) $(CDEBUGFLAGS)
-
-DTINCLUDE	= -I/usr/dt/include
-X11INCLUDE	= -I/usr/include/X11R5
-
-INCLUDES	= $(DTINCLUDE) $(X11INCLUDE)
-
-DTLIBS		= -L/usr/dt/lib -lDtSvc -ltt -lXm
-X11LIBS		= -L/usr/lib/X11R5 -lXt -lX11
-SYSLIBS		=
-
-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)

cde/examples/dtdts/Makefile.hp

@@ -1,45 +0,0 @@
-# $XConsortium: Makefile.hp /main/2 1996/05/13 11:47:02 drk $
-##########################################################################
-#
-#  Makefile for dtdts examples (HP)
-#
-#  (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		= -Aa -z $(DEFINES) $(CDEBUGFLAGS)
-
-DTINCLUDE	= -I/usr/dt/include
-X11INCLUDE	= -I/usr/include/X11R5
-
-INCLUDES	= $(DTINCLUDE) $(X11INCLUDE)
-
-DTLIBS		= -L/usr/dt/lib -lDtSvc -lXm
-X11LIBS		= -L/usr/lib/X11R5 -lXt -lX11
-SYSLIBS		=
-
-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)

cde/examples/dtscreen/Makefile.hp

@@ -1,45 +0,0 @@
-# $XConsortium: Makefile.hp /main/2 1996/05/13 11:48:11 drk $
-##########################################################################
-#
-#  Makefile for dtsession examples (HP)
-#
-#  (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		= -Aa -z $(DEFINES) $(CDEBUGFLAGS)
-
-DTINCLUDE	= -I/usr/dt/include
-X11INCLUDE	= -I/usr/include/X11R5
-
-INCLUDES	= $(DTINCLUDE) $(X11INCLUDE)
-
-DTLIBS		= -L/usr/dt/lib -lDtSvc
-X11LIBS		= -L/usr/lib/X11R5 -lXt -lX11
-SYSLIBS		= -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)

cde/examples/dtsession/Makefile.hp

@@ -1,45 +0,0 @@
-# $XConsortium: Makefile.hp /main/2 1996/05/13 11:49:37 drk $
-##########################################################################
-#
-#  Makefile for dtsession examples (HP)
-#
-#  (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		= -Aa -z $(DEFINES) $(CDEBUGFLAGS)
-
-DTINCLUDE	= -I/usr/dt/include
-X11INCLUDE	= -I/usr/include/X11R5
-
-INCLUDES	= $(DTINCLUDE) $(X11INCLUDE)
-
-DTLIBS		= -L/usr/dt/lib -lDtSvc -lXm
-X11LIBS		= -L/usr/lib/X11R5 -lXt -lX11
-SYSLIBS		=
-
-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)

cde/examples/dtterm/Makefile.hp

@@ -1,45 +0,0 @@
-# $XConsortium: Makefile.hp /main/2 1996/05/13 11:51:00 drk $
-##########################################################################
-#
-#  Makefile for dtterm examples (HP)
-#
-#  (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		= -D_HPUX_SOURCE
-CDEBUGFLAGS	= -O
-CFLAGS		= -Aa -z $(DEFINES) $(CDEBUGFLAGS)
-
-DTINCLUDE	= -I/usr/dt/include
-X11INCLUDE	= -I/usr/include/X11R5
-
-INCLUDES	= $(DTINCLUDE) $(X11INCLUDE)
-
-DTLIBS		= -L/usr/dt/lib -lDtTerm -lXm
-X11LIBS		= -L/usr/lib/X11R5 -lXt -lX11
-SYSLIBS		=
-
-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)

cde/examples/dtwidget/Makefile.hp

@@ -1,53 +0,0 @@
-# $XConsortium: Makefile.hp /main/2 1996/05/13 11:52:14 drk $
-##########################################################################
-#
-#  Makefile for dtwidget examples (HP)
-#
-#  (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		= -Aa -z $(DEFINES) $(CDEBUGFLAGS)
-
-DTINCLUDE	= -I/usr/dt/include
-X11INCLUDE	= -I/usr/include/X11R5
-
-INCLUDES	= $(DTINCLUDE) $(X11INCLUDE)
-
-DTLIBS		= -L/usr/dt/lib -lDtWidget -lDtSvc -ltt -lXm
-X11LIBS		= -L/usr/lib/X11R5 -lXt -lX11
-SYSLIBS		=
-
-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)

cde/examples/dtwsm/Makefile.hp

@@ -1,53 +0,0 @@
-# $XConsortium: Makefile.hp /main/2 1996/05/13 11:53:35 drk $
-##########################################################################
-#
-#  Makefile for dtwidget examples (HP)
-#
-#  (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		= -Aa -z $(DEFINES) $(CDEBUGFLAGS)
-
-DTINCLUDE	= -I/usr/dt/include
-X11INCLUDE	= -I/usr/include/X11R5
-
-INCLUDES	= $(DTINCLUDE) $(X11INCLUDE)
-
-DTLIBS		= -L/usr/dt/lib -lDtSvc -ltt -lXm
-X11LIBS		= -L/usr/lib/X11R5 -lXt -lX11
-SYSLIBS		=
-
-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)

cde/examples/template/Makefile.hp

@@ -1,107 +0,0 @@
-# $XConsortium: Makefile.hp /main/3 1996/05/13 12:00:59 drk $
-##########################################################################
-#
-#  Makefile for template example (HP)
-#
-#  (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		= -D_INCLUDE_XOPEN_SOURCE
-CDEBUGFLAGS	= -O
-CFLAGS		= -Aa -z $(DEFINES) $(CDEBUGFLAGS)
-
-DTINCLUDE	= -I/usr/dt/include
-X11INCLUDE	= -I/usr/include/X11R5
-
-INCLUDES	= $(DTINCLUDE) $(X11INCLUDE)
-
-DTLIBS		= -L/usr/dt/lib -lDtHelp -lDtSvc -lXm -ltt
-X11LIBS		= -L/usr/lib/X11R5 -lXt -lX11
-SYSLIBS		=
-
-LIBRARIES	= $(DTLIBS) $(X11LIBS) $(SYSLIBS)
-LDFLAGS		=
-
-.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
-	$(CHMODEXE) $(ACTIONS) 
-	$(CP) $(README) $(EXAMPLES) $(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

cde/examples/tt/Makefile.hp

@@ -1,45 +0,0 @@
-# $XConsortium: Makefile.hp /main/2 1996/05/13 12:02:22 drk $
-##########################################################################
-#
-#  Makefile for ToolTalk examples (HP)
-#
-#  (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		= -D_HPUX_SOURCE
-CDEBUGFLAGS	= -O
-CFLAGS		= -Aa -z $(DEFINES) $(CDEBUGFLAGS)
-
-DTINCLUDE	= -I/usr/dt/include
-X11INCLUDE	= -I/usr/include/X11R5
-
-INCLUDES	= $(DTINCLUDE) $(X11INCLUDE)
-
-DTLIBS		= -L/usr/dt/lib -ltt -lXm
-X11LIBS		= -L/usr/lib/X11R5 -lXt -lX11
-SYSLIBS		=
-
-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)

cde/include/Dt/SearchP.h

@@ -154,13 +154,6 @@
 #define UNIX		/* used in vista.h and elsewhere */
 #endif
 
-#ifdef HP_COMPILER
-#define _INCLUDE_HPUX_SOURCE
-#define _INCLUDE_POSIX_SOURCE
-#define _INCLUDE_XOPEN_SOURCE
-#endif
-
-
 /*----------------------- AUSTEXT.H ---------------------
  * DBMS record/key structure and constant declarations.
  * These represent the database schema formerly in austext.h

cde/include/Dt/TermPrimP.h

@@ -51,13 +51,8 @@
 **  (is it worth making resources for defaultShell
 **  and defaultShellArgv0?)  JRM
 */
-#ifdef    hpV4
-#   define DEFAULT_SHELL        "/usr/bin/sh"
-#   define DEFAULT_SHELL_ARGV0  "sh"
-#else  /* hpV4 */
-#   define DEFAULT_SHELL        "/bin/sh"
-#   define DEFAULT_SHELL_ARGV0  "sh"
-#endif /* hpV4 */
+#define DEFAULT_SHELL        "/bin/sh"
+#define DEFAULT_SHELL_ARGV0  "sh"
 
 #ifdef	__cplusplus
 extern "C" {

cde/include/Dt/XlationSvc.h

@@ -123,11 +123,9 @@ platforms as part of a translation.
 #define _DtPLATFORM_UNKNOWN ((const char *)0)
 #define _DtPLATFORM_CURRENT ((const char *)0)
 #define _DtPLATFORM_CDE     "CDE"
-#define _DtPLATFORM_HPUX    "HP-UX"
 #define _DtPLATFORM_AIX     "AIX"
 #define _DtPLATFORM_SUNOS   "SunOS"
 #define _DtPLATFORM_SOLARIS "Solaris"      /* verify */
-#define _DtPLATFORM_XENIX   "Xenix"        /* verify */
 /*$END$*/
 
 

cde/include/Dt/vista.h

@@ -302,9 +302,6 @@ typedef struct {DB_ADDR *ptr; LOCK_DESC} DB_ADDR_P;
 #ifdef ANSI
 #define Piv(t)	,...	/* begining of variable number of parameters */
 #define Pv(t)	/**/	/* function has 0 or more parameters */
-#else
-#define Piv(t)	,	/* [XENIX] begining of variable number of parameters */
-#define Pv(t)	,	/* [XENIX] function has 0 or more parameters */
 #endif
 #else
 #define P0	/**/

cde/include/EUSCompat.h

@@ -52,7 +52,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(CSRG_BASED)
+#if defined(__linux__) || defined(SunOS) || defined(CSRG_BASED)
 # include <sys/types.h>
 #endif
 
@@ -69,44 +69,6 @@ extern "C" {
 #endif
 #endif   /* sun && _XOPEN_SOURCE */
 
-/*
-** HPUX defines most of what we need, if we set the right
-** include options before including the system files.
-*/
-#if defined(HPUX)
-
-#ifndef _INCLUDE_POSIX_SOURCE
-#define _INCLUDE_POSIX_SOURCE
-#endif
-
-#ifndef _INCLUDE_XOPEN_SOURCE
-#define _INCLUDE_XOPEN_SOURCE
-#endif
-
-#ifndef _INCLUDE_AES_SOURCE
-#define _INCLUDE_AES_SOURCE
-#endif
-
-#ifndef _INCLUDE_HPUX_SOURCE
-#define _INCLUDE_HPUX_SOURCE
-#endif
-
-#ifndef hpV4
-typedef unsigned long ulong_t;
-#endif /* hpV4 */
-typedef unsigned char uchar_t;
-typedef enum {B_FALSE, B_TRUE} boolean_t;
-
-#define _SC_PAGESIZE	_SC_PAGE_SIZE
-
-#ifndef MAXPATHLEN
-#include <sys/param.h>
-#endif
-
-#define MAXNAMELEN      256
-
-#endif	/* HPUX */
-
 #if defined(__linux__) || defined(CSRG_BASED)
 #include <string.h>  /* memset for libcsa and others */
 typedef enum {B_FALSE, B_TRUE} boolean_t;
@@ -115,7 +77,7 @@ typedef enum {B_FALSE, B_TRUE} boolean_t;
 
 
 /*
-** AIX, like HPUX defines most of what we need.
+** AIX defines
 */
 #if defined(AIX)
 
@@ -130,7 +92,6 @@ typedef enum {B_FALSE, B_TRUE} boolean_t;
 #include <sys/types.h>
 
 #define _SC_PAGESIZE	_SC_PAGE_SIZE
-#define vfork		fork
 
 #ifndef MAXPATHLEN
 #include <sys/param.h>

cde/include/SPC/spc-proto.h

@@ -110,7 +110,6 @@
 
 #define DELETE_LOGFILE     21
 
-#define RESET_TERMIO       22	/* This is obsolete, (hpux binary version) */
 #define RESET_TERMIOS      23
 
 /* New B.00 protocol requests */

cde/include/bms/sbport.h

@@ -44,7 +44,6 @@
   __cplusplus    	- Will be set for C++ compilers
   __STDCPP__		- Will be set for ANSI and C++ compilers
 
- __hpux 		- Will be set for HP-UX systems
  __sun			- Will be set for SUN systems
  __aix                  - Will be set for IBM (AIX) systems
 
@@ -88,27 +87,12 @@
 #   define __sun
 #endif
 
-#if defined(hpux) && !defined(__hpux)
-#   define __hpux
-#endif
-
 #if defined(_AIX) && !defined(__aix)
 #   define __aix
 #   define OSF_MOTIF_1_1_1
 #   define OSF_BUG
 #endif
 
-#ifdef __hpux 
-#   define __sysv
-/* __hp9000s300 or __hp9000s800 is defined by HP-UX cpp */
-#    if !defined (__hpux_8_0)
-#       define __hp_7_0
-#    endif
-#    define __hp_nls_16
-#    define __hp_color_object
-#    define __unsigned_char_ptr_yytext
-#endif  /* __hpux */
-
 #ifdef __sun
 #   if defined(sparc) && !defined(__sparc)
 #      define __sparc
@@ -181,7 +165,7 @@
 /* about above.  So, declare them only if we don't already have them */
 /* ----------------------------------------------------------------- */
 
-#if defined(_HPUX_SOURCE) || defined(__sun) || defined(_INCLUDE_BSD_SOURCE) || defined(__aix) || defined(__linux__)
+#if defined(__sun) || defined(_INCLUDE_BSD_SOURCE) || defined(__aix) || defined(__linux__)
        /* the "u_types" are defined in standard files */
 #      undef _INCLUDE_BSD_SOURCE
 #else

cde/lib/DtHelp/HP-UX.lcx

@@ -1,606 +0,0 @@
-!!!!!!!!!!!!!! HP-UX Locale-Related Translations !!!!!!!!!!!!!!
-! File:			HP-UX.lcx
-! Default location:	/usr/dt/config/svc/HP-UX.lcx
-! Purpose:
-!    Define the HP-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 HP 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: HP-UX.lcx /main/3 1995/10/26 12:23:15 rswiston $
-! Defects:
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-!!!!!!!!!!!!!!!! translation specification syntax !!!!!!!!!!!!!!!!!!!
-! Introductory fields:
-! ====================
-! The _DtLcx translation specifications have a fixed number of
-! introductory fields followed by a several standard value
-! fields and the operation-specific value.
-! The introductory fields are:
-!  <platform>.<version range>.<operation(s)>.<kind>
-!
-! Platform generally is the same string as uname(1) -s.
-! Version range utilizes normalized version numbers that 
-!   are acquired using the 'version' translations.
-! Operations are one or more comma-separated strings that
-!   uniquely identify the operation associated with the
-!   operation-specific value.  This string is specified
-!   as part of the request for a translation.
-!
-! Kinds of translations allow the mechanism to support several modes
-!   of operation, each useful for different purposes.  When
-!   reading or writing a specification, pay particular attention
-!   to the kind of specification, as this guides the usage of it.
-!
-! Specification kinds:
-!  .=. means a valid bi-directional translation requiring the op-value 
-!      in the translation specification to exactly match the op-value of 
-!      the call to _DtLcxXlateOpToStd(), e.g. foo matches only foo
-!  .~. means a valid bi-directional translation requiring the op-value 
-!      in the translation specification to match the beginning of the
-!      op-value of the call to _DtLcxXlateOpToStd(), e.g. foo matches 
-!      foo@bar.  This is often useful, e.g. for operation-specific
-!      locale strings that may also contain modifier suffixes.
-!  .>. means only from standard to op-specific (generally a 
-!      compatibility translation, meaning on op-specific value 
-!      that will work for the standard, although that is not 
-!      the straight mapping)
-!  .<. means only from op-specific to standard (generally a
-!      regex in the op-value which is used to map a class of
-!      op values to a standard value)
-!  .0. means that translation is not supported and if a translation
-!      request matches the specification, the request will fail.
-!
-! Standard values:
-! ================
-! _DtLcx defines the order of the standard values in the
-! translations it utilizes.  All translation specifications
-! must adhere to this order.
-!    <std lang_terr>.<std codeset>.<std modifier>
-! In CDE 1.0, no modifiers are 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 <std codeset>
-! should specify the wildcard character ("?") for the 
-! <std lang_terr> value.
-!
-! Operation-specific value:
-! =========================
-! The operation-specific value is a string that is used
-! according to the kind of translation.  The syntax is
-!      : <op-string>
-! or   :  "<op-string>", if it contains white space
-!
-! Filling in the table of translations:
-! =====================================
-! The person preparing the translation table should know 
-! the minimum version of the target platform that is
-! be supported.  For example, assume that we must
-! complete the table for all versions 9.00 and higher.
-! 
-! The objective is then to provide two sets of translations:
-! a full set of translations from CDE standard locales to
-! valid platform locales, and a full set of translations
-! from valid platform locales to some or all CDE standard
-! locales.  
-! 
-! Translations from CDE standard locales to valid platform
-! locales must use the .~. .=. or .>. mappings.  When there 
-! is a 1:1 mapping between a CDE locale and a platform locale, 
-! use the .~. or .=. mapping.  See the comment below to 
-! decide which to use.  When there is no 1:1 mapping between 
-! CDE locale and platform locale, use the .>. mapping.  This 
-! provides a valid translation from the CDE locale to the 
-! best-suitable platform locale, but never translates from 
-! that platform locale to the CDE locale.
-! 
-! Translations from every platform locale to the appropriate 
-! CDE locale must use the .~. .=. or .<. mappings.
-! When there is a 1:1 mapping between a platform locale and
-! a CDE standard locale, use the .~. or .=. mapping.  See the
-! comment below to decide which to use.  If there is a 1:1
-! mapping, but the platform locale pattern uses a regular
-! expression, or if more than one platform locale can 
-! be translated to one CDE standard locale, the .<. mapping must 
-! be used.  
-! 
-! If no appropriate CDE standard locale can be found, you have 
-! identified the need for a new CDE standard locale.  Refer to 
-! the instructions at the head of this file for how to go about 
-! registering a new CDE standard locale.  You should not create 
-! a new "standard" locale (the left hand side of the translation 
-! specification) without registering it with CDE, because this 
-! will hinder the free exchange of information across locales 
-! and platforms.
-! 
-! The .=. and .~. mappings are similar.  The difference is
-! that the .=. mapping requires an exact string match between
-! the platform locale and the string provided to the
-! translation routine.  Generally speaking, this mapping
-! is risky unless exact matchings can be guaranteed in
-! all DtLcx clients for the particular operation in question.
-! The .~. mapping is to be preferred, but the .=. translation
-! is useful in limited situations, where similar strings may
-! occur.
-! 
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-! uncomment this resource to debug/test the translation db
-!*debugDtXlate: True
-
-!!!!!!!!!!!!!!!! HP 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.
-!!!
-HP-UX.?.version.<.1000:  "[A-Z]\\.10\\.00"       !! any HPUX 10.00 version
-HP-UX.?.version.<.1001:  "[A-Z]\\.10\\..*"       !! any HPUX 10.x version
-HP-UX.?.version.<.900:   "[A-Z]\\.09\\..*"       !! any HPUX 9.x version
-HP-UX.?.version.<.903:   "[A-Z]\\.09\\.0[3-9].*" !! any HPUX 9.03-9.09 version
-HP-UX.?.version.<.910:   "[A-Z]\\.09\\.[1-9].*"  !! any HPUX 9.1+ version
-HP-UX.?.version.<.800:   "[A-Z]\\.08\\..*"       !! any HPUX 8.x version
-
-
-!!!!!!!!!!!!!!!! HP-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 HP 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
-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,           ,
-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,   ,   ,           ,
-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                ,   ,   ,           ,
-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       ,
-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       ,
-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       ,
-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       ,
-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       ,
-! 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,           ,
-! 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,   ,   ,           ,
-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,   ,           ,
-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"),
-
-! W European/Americas, HP-ROMAN8 codeset
-HP-UX.700+.setlocale.~.da_DK.HP-ROMAN8:	danish          ! Danish, Denmark                 ,   , HP
-HP-UX.700+.setlocale.~.de_DE.HP-ROMAN8:	german          ! German, Germany                 ,   , HP
-HP-UX.700+.setlocale.>.en_GB.HP-ROMAN8:	english         ! English, U.K.                   ,   , HP
-HP-UX.700+.setlocale.~.en_US.HP-ROMAN8:	english         ! English, USA                    ,   , HP
-HP-UX.700+.setlocale.~.es_ES.HP-ROMAN8:	spanish         ! Spanish, Spain                  ,   , HP
-HP-UX.700+.setlocale.~.fi_FI.HP-ROMAN8:	finnish         ! Finnish, Finland                ,   , HP
-HP-UX.700+.setlocale.~.fr_CA.HP-ROMAN8:	c-french        ! French, Canada                  ,   , HP
-HP-UX.700+.setlocale.~.fr_FR.HP-ROMAN8:	french          ! French, France                  ,   , HP
-HP-UX.700+.setlocale.~.is_IS.HP-ROMAN8:	icelandic       ! Icelandic, Iceland              ,   , HP
-HP-UX.700+.setlocale.~.it_IT.HP-ROMAN8:	italian         ! Italian, Italy                  ,   , HP
-HP-UX.700+.setlocale.~.nl_NL.HP-ROMAN8:	dutch           ! Dutch, The Netherlands          ,   , HP
-HP-UX.700+.setlocale.~.no_NO.HP-ROMAN8:	norwegian       ! Norwegian, Norway               ,   , HP
-HP-UX.700+.setlocale.~.pt_PT.HP-ROMAN8:	portuguese      ! Portuguese, Portugal            ,   , HP
-HP-UX.700+.setlocale.~.sv_SE.HP-ROMAN8:	swedish         ! Swedish, Sweden                 ,   , HP
-
-! E European 
-HP-UX.700+.setlocale.~.cs_CS.ISO-8859-2:	czech           ! Czech(1)                        ,IBM, HP
-! HP-UX.700+.setlocale.>.hr_HR.ISO-8859-2:		        ! Croatian, Croatia               ,IBM
-HP-UX.700+.setlocale.~.hu_HU.ISO-8859-2:	hungarian       ! Hungarian, Hungry          XoJIG,IBM, HP
-HP-UX.700+.setlocale.~.pl_PL.ISO-8859-2:	polish          ! Polish, Poland             XoJIG,IBM, HP 
-HP-UX.700+.setlocale.~.ro_RO.ISO-8859-2:	rumanian        ! Rumanian, Romania          XoJIG,IBM, HP
-HP-UX.700+.setlocale.~.sh_YU.ISO-8859-2:	serbocroatian   ! Serbocroatian, Yugoslavia(1)    ,IBM, HP 
-HP-UX.700+.setlocale.~.sl_CS.ISO-8859-2:	slovene         ! Slovenian                       ,IBM, HP
-HP-UX.700+.setlocale.>.si_SI.ISO-8859-2:	slovene         ! Slovenian                       ,IBM, HP
-! HP-UX.700+.setlocale.>.sk_SK.ISO-8859-2:		        ! Slovak                          ,IBM
-
-! Cyrillic 
-HP-UX.700+.setlocale.~.bg_BG.ISO-8859-5:	bulgarian       ! Bulgarian, Bulgaria             ,IBM, HP
-! HP-UX.700+.setlocale.>.mk_MK.ISO-8859-5:		        ! Macedonian                      ,IBM
-HP-UX.700+.setlocale.~.ru_RU.ISO-8859-5:	russian         ! Russian(1)                      ,IBM, HP
-HP-UX.700+.setlocale.>.ru_SU.ISO-8859-5:	russian         ! Russian(1)                      ,IBM, HP
-! HP-UX.700+.setlocale.>.sp_YU.ISO-8859-5:	       		! Serbian,Yugoslavia(1)           ,IBM
-
-! Arabic 
-HP-UX.700+.setlocale.~.ar_DZ.ISO-8859-6:	 arabic.iso88596  ! Arabic(2)                       ,IBM, HP
-HP-UX.700+.setlocale.~.ar_DZ.HP-ARABIC8: arabic-w         ! Arabic(2)                       ,   , HP
-HP-UX.700+.setlocale.~.ar_SA.ISO-8859-6:	 arabic.iso88596  ! Arabic(2)                       ,IBM, HP
-HP-UX.700+.setlocale.~.ar_SA.HP-ARABIC8: arabic   	  ! Arabic(2)                       ,   , HP
-
-! Hebrew 
-HP-UX.700+.setlocale.~.iw_IL.ISO-8859-8:  hebrew.iso88598  ! Hebrew, Israel                  ,IBM, HP
-HP-UX.700+.setlocale.~.iw_IL.HP-HEBREW8: hebrew   	  ! Hebrew, Israel                  ,   , HP
-
-! Greek 
-HP-UX.700+.setlocale.~.el_GR.ISO-8859-7:	greek.iso88597    ! Greek, Greece                   ,IBM, HP
-HP-UX.700+.setlocale.~.el_GR.HP-GREEK8:	greek	          ! Greek, Greece                   ,   , HP
-
-! Turkish 
-HP-UX.700+.setlocale.~.tr_TR.ISO-8859-9:	  turkish.iso88599 ! Turkish, Turkey                 ,IBM, HP
-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"),
-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"),
-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"),
-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       ,
-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,           , 
-
-! Thai 
-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       ,
-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,   ,   ,           ,
-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,   ,   ,           ,
-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       ,
-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       ,
-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       ,
-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       ,
-! 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,           ,
-! 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,   ,   ,           ,
-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,   ,           ,
-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"),
-
-! W European/Americas, HP-ROMAN8 codeset
-HP-UX.1000+.setlocale.~.da_DK.HP-ROMAN8:	da_DK.roman8         ! Danish, Denmark                 ,   , HP
-HP-UX.1000+.setlocale.~.de_DE.HP-ROMAN8:	de_DE.roman8         ! German, Germany                 ,   , HP
-HP-UX.1000+.setlocale.~.en_GB.HP-ROMAN8:	en_GB.roman8         ! English, U.K.                   ,   , HP
-HP-UX.1000+.setlocale.~.en_US.HP-ROMAN8:	en_US.roman8         ! English, USA                    ,   , HP
-HP-UX.1000+.setlocale.~.es_ES.HP-ROMAN8:	es_ES.roman8         ! Spanish, Spain                  ,   , HP
-HP-UX.1000+.setlocale.~.fi_FI.HP-ROMAN8:	fi_FI.roman8         ! Finnish, Finland                ,   , HP
-HP-UX.1000+.setlocale.~.fr_CA.HP-ROMAN8:	fr_CA.roman8         ! French, Canada                  ,   , HP
-HP-UX.1000+.setlocale.~.fr_FR.HP-ROMAN8:	fr_FR.roman8         ! French, France                  ,   , HP
-HP-UX.1000+.setlocale.~.is_IS.HP-ROMAN8:	is_IS.roman8         ! Icelandic, Iceland              ,   , HP
-HP-UX.1000+.setlocale.~.it_IT.HP-ROMAN8:	it_IT.roman8         ! Italian, Italy                  ,   , HP
-HP-UX.1000+.setlocale.~.nl_NL.HP-ROMAN8:	nl_NL.roman8         ! Dutch, The Netherlands          ,   , HP
-HP-UX.1000+.setlocale.~.no_NO.HP-ROMAN8:	no_NO.roman8         ! Norwegian, Norway               ,   , HP
-HP-UX.1000+.setlocale.~.pt_PT.HP-ROMAN8:	pt_PT.roman8         ! Portuguese, Portugal            ,   , HP
-HP-UX.1000+.setlocale.~.sv_SE.HP-ROMAN8:	sv_SE.roman8         ! Swedish, Sweden                 ,   , HP
-
-! E European 
-HP-UX.1000+.setlocale.~.cs_CS.ISO-8859-2:	cs_CS.iso88592         ! Czech(1)                        ,IBM, HP
-! HP-UX.1000+.setlocale.>.hr_HR.ISO-8859-2:			       ! Croatian, Croatia               ,IBM
-HP-UX.1000+.setlocale.~.hu_HU.ISO-8859-2:	hu_HU.iso88592         ! Hungarian, Hungry          XoJIG,IBM, HP
-HP-UX.1000+.setlocale.~.pl_PL.ISO-8859-2:	pl_PL.iso88592         ! Polish, Poland             XoJIG,IBM, HP 
-HP-UX.1000+.setlocale.~.ro_RO.ISO-8859-2:	ro_RO.iso88592         ! Rumanian, Romania          XoJIG,IBM, HP
-HP-UX.1000+.setlocale.~.sh_YU.ISO-8859-2:	sh_YU.iso88592         ! Serbocroatian, Yugoslavia(1)    ,IBM, HP 
-HP-UX.1000+.setlocale.~.sl_CS.ISO-8859-2:	sl_CS.iso88592         ! Slovenian                       ,IBM, HP
-! HP-UX.1000+.setlocale.>.si_SI.ISO-8859-2:			       ! Slovenian                       ,IBM, HP
-! HP-UX.1000+.setlocale.>.sk_SK.ISO-8859-2:			       ! Slovak                          ,IBM
-
-! Cyrillic 
-HP-UX.1000+.setlocale.~.bg_BG.ISO-8859-5:	bg_BG.iso88595		! Bulgarian, Bulgaria             ,IBM, HP
-! HP-UX.1000+.setlocale.>.mk_MK.ISO-8859-5:				! Macedonian                      ,IBM
-HP-UX.1000+.setlocale.>.ru_RU.ISO-8859-5:	ru_SU.iso88595 		! Russian(1)                      ,IBM, HP
-HP-UX.1000+.setlocale.~.ru_SU.ISO-8859-5:	ru_SU.iso88595 		! Russian(1)                      ,IBM, HP
-! HP-UX.1000+.setlocale.>.sp_YU.ISO-8859-5:				! Serbian,Yugoslavia(1)           ,IBM
-
-! Arabic 
-HP-UX.1000+.setlocale.>.ar_DZ.ISO-8859-6:	ar_SA.iso88596 		! Arabic(2)                       ,IBM, HP
-HP-UX.1000+.setlocale.~.ar_DZ.HP-ARABIC8:	ar_DZ.arabic8 		! Arabic(2)                       ,   , HP
-HP-UX.1000+.setlocale.~.ar_SA.ISO-8859-6:	ar_SA.iso88596 		! Arabic(2)                       ,IBM, HP
-HP-UX.1000+.setlocale.~.ar_SA.HP-ARABIC8:	ar_SA.arabic8 		! Arabic(2)                       ,   , HP
-
-! Hebrew 
-HP-UX.1000+.setlocale.~.iw_IL.ISO-8859-8:	iw_IL.iso88598		! Hebrew, Israel                  ,IBM, HP
-HP-UX.1000+.setlocale.~.iw_IL.HP-HEBREW8:	iw_IL.hebrew8		! Hebrew, Israel                  ,   , HP
-
-! Greek 
-HP-UX.1000+.setlocale.~.el_GR.ISO-8859-7:	el_GR.iso88597		! Greek, Greece                   ,IBM, HP
-HP-UX.1000+.setlocale.~.el_GR.HP-GREEK8:	el_GR.greek8		! Greek, Greece                   ,   , HP
-
-! Turkish 
-HP-UX.1000+.setlocale.~.tr_TR.ISO-8859-9:	tr_TR.iso88599		! Turkish, Turkey                 ,IBM, HP
-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"),
-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"),
-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,           , 
-
-! Thai 
-HP-UX.1000+.setlocale.~.th_TH.TIS-620:	th_TH.tis620		! Thai, Thailand                  ,IBM, HP
-
-
-! codesets supported for iconv(1,3) on HP-UX 7.0 and above
-HP-UX.700+.iconv1,iconv3.=.?.HP-ROMAN8:		roman8
-HP-UX.700+.iconv1,iconv3.=.?.ISO-8859-1:	iso8859_1
-HP-UX.700+.iconv1,iconv3.=.?.HP-ARABIC8:	arabic8
-HP-UX.700+.iconv1,iconv3.=.?.HP-GREEK8:		greek8
-HP-UX.700+.iconv1,iconv3.=.?.HP-HEBREW8:	hebrew8
-HP-UX.700+.iconv1,iconv3.=.?.HP-TURKISH8:	turkish8
-HP-UX.700+.iconv1,iconv3.=.?.EUC-KR:		korean15
-HP-UX.700+.iconv1,iconv3.=.?.ISO-2022-JP:	jis
-HP-UX.700+.iconv1,iconv3.<.?.HP-SJIS:	japanese15
-HP-UX.700+.iconv1,iconv3.=.?.HP-SJIS:	sjis
-HP-UX.700+.iconv1,iconv3.=.?.HP-KANA8:	kana8
-HP-UX.700+.iconv1,iconv3.=.?.EUC-JP:	ujis
-HP-UX.700+.iconv1,iconv3.=.?.HP-CCDC:	roc15
-
-! codesets supported by iconv(1,3) after HP-UX 10.0
-HP-UX.1000+.iconv1,iconv3.~.?.HP-BIG5:	big5
-HP-UX.1000+.iconv1,iconv3.~.?.EUC-TW:	eucTW
-HP-UX.1000+.iconv1,iconv3.~.?.TIS-620:	tis620
-HP-UX.1000+.iconv1,iconv3.>.?.EUC-CN:	hp15cn
-HP-UX.1000+.iconv1,iconv3.~.?.HP-15CN:	hp15cn
-HP-UX.1000+.iconv1,iconv3.~.?.EUC-KR:	eucKR
-HP-UX.1000+.iconv1,iconv3.~.?.ISO-8859-2: iso8859_2
-HP-UX.1000+.iconv1,iconv3.~.?.ISO-8859-5: iso8859_5
-HP-UX.1000+.iconv1,iconv3.~.?.ISO-8859-6: iso8859_6
-HP-UX.1000+.iconv1,iconv3.~.?.ISO-8859-7: iso8859_7
-HP-UX.1000+.iconv1,iconv3.~.?.ISO-8859-8: iso8859_8
-HP-UX.1000+.iconv1,iconv3.~.?.ISO-8859-9: iso8859_9
-HP-UX.1000+.iconv1,iconv3.~.?.IBM-437:	cp437
-HP-UX.1000+.iconv1,iconv3.~.?.IBM-850:	cp850
-
-! codesets not supported by iconv(1,3) through 10.0 HP-UX release
-!HP-UX.?.iconv1,iconv3.=.?.ISO-2022-KR:
-!HP-UX.?.iconv1,iconv3.=.?.ISO-2022-TW:
-!HP-UX.?.iconv1,iconv3.=.?.ISO-2022-CN:
-!HP-UX.?.iconv1,iconv3.~.?.IBM-856:
-!HP-UX.?.iconv1,iconv3.~.?.IBM-1046:
-!HP-UX.?.iconv1,iconv3.~.?.UCS-2:
-!HP-UX.?.iconv1,iconv3.~.?.UTF-8:
-
-! codesets supported for nl_langinfo on HP-UX 7.0 and above
-HP-UX.700-999.nl_langinfo(CODESET).=.?.HP-ROMAN8:   	ROMAN8
-HP-UX.700-999.nl_langinfo(CODESET).>.?.?:   		ROMAN8    !!! nl_langinfo is hardwired to ROMAN8 for all codesets
-HP-UX.1000+.nl_langinfo(CODESET).=.?.HP-ROMAN8:		roman8
-HP-UX.1000+.nl_langinfo(CODESET).=.?.ISO-8859-1:	iso8859_1
-HP-UX.1000+.nl_langinfo(CODESET).=.?.HP-ARABIC8:	arabic8
-HP-UX.1000+.nl_langinfo(CODESET).=.?.HP-GREEK8:		greek8
-HP-UX.1000+.nl_langinfo(CODESET).=.?.HP-HEBREW8:	hebrew8
-HP-UX.1000+.nl_langinfo(CODESET).=.?.HP-TURKISH8:	turkish8
-HP-UX.1000+.nl_langinfo(CODESET).=.?.EUC-KR:		korean15   !!! verify std matches op
-HP-UX.1000+.nl_langinfo(CODESET).<.?.HP-SJIS:	japanese15
-HP-UX.1000+.nl_langinfo(CODESET).=.?.HP-SJIS:	sjis
-HP-UX.1000+.nl_langinfo(CODESET).=.?.HP-KANA8:	kana8
-HP-UX.1000+.nl_langinfo(CODESET).=.?.EUC-JP:	ujis
-HP-UX.1000+.nl_langinfo(CODESET).=.?.HP-CCDC:	roc15	!!! verify std matches op
-
-! 10.0 and above supported iconv(1) codesets 
-!!! collect and verify this
-
-! multibyte codesets 
-! This translation provides an alternative to a call to
-! using setlocale() and MB_CUR_MAX to determine this.
-HP-UX.?.multibyte.=.?.EUC-KR:		2
-HP-UX.?.multibyte.=.?.HP-SJIS:		2
-HP-UX.700+.multibyte.=.?.EUC-JP:	2
-HP-UX.1000+.multibyte.=.?.EUC-JP:	4
-HP-UX.?.multibyte.=.?.IBM-932:		2
-HP-UX.?.multibyte.=.?.HP-CCDC:		2
-HP-UX.?.multibyte.=.?.HP-BIG5:		2
-HP-UX.?.multibyte.=.?.EUC-TW:		2
-HP-UX.?.multibyte.=.?.TIS-620:		2
-HP-UX.?.multibyte.=.?.EUC-CN:		2
-HP-UX.?.multibyte.=.?.HP-15CN:		2
-HP-UX.?.multibyte.=.?.EUC-KR:		2
-HP-UX.?.multibyte.=.?.EUC-TW:		2
-
-! Translations from predefined CCDF-locales to CDE Standard Locales
-HP-UX.700+.ccdf.=.?.HP-ROMAN8:    	hp-roman8
-HP-UX.700+.ccdf.=.?.ISO-8859-1:		iso8859-1
-HP-UX.700+.ccdf.=.ko_KR.EUC-KR:		hp-korean15
-HP-UX.700+.ccdf.=.ja_JP.HP-SJIS:	hp-japanese15
-HP-UX.700+.ccdf.=.ja_JP.EUC-JP:		hp-japaneseeuc
-HP-UX.700+.ccdf.=.?.DT-SYMBOL-1:	symbol         !!! this is the Dt symbol font
-! These CDE standard locales may have CCDF-locales, but they are defined by localizers
-! HP-UX.700+.ccdf.=.ar_SA.HP-ARABIC8:	arabic8
-! HP-UX.700+.ccdf.=.el_GR.HP-GREEK8:	greek8
-! HP-UX.700+.ccdf.=.iw_IL.HP-HEBREW8:	hebrew8
-! HP-UX.700+.ccdf.=.tr_TR.HP-TURKISH8:	turkish8
-! HP-UX.700+.ccdf.<.ja_JP.HP-SJIS:	sjis
-! HP-UX.700+.ccdf.=.ja_JP.HP-KANA8:	kana8
-! HP-UX.700+.ccdf.=.ja_JP.EUC-JP:	ujis
-! HP-UX.700+.ccdf.=.zh_CN.HP-CCDC:	roc15		
-
-
-! Codesets that require multibyte parsing to avoid confusion with shell special chars
-HP-UX.?.dtkshSpecialParse.=.ja_JP.HP-SJIS:	True
-HP-UX.?.dtkshSpecialParse.=.ja_JP.IBM-932:	True
-HP-UX.?.dtkshSpecialParse.=.zh_TW.HP-BIG5:	True
-HP-UX.?.dtkshSpecialParse.=.zh_TW.HP-CCDC:	True
-HP-UX.?.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 JIS
-!! before it is sent.
-HP-UX.?.interchangeCodeset.~.?.ISO-8859-1:	ISO-8859-1	! ISO Latin 1
-HP-UX.?.interchangeCodeset.>.?.HP-ROMAN8:	ISO-8859-1	! HP Roman8 
-!HP-UX.?.interchangeCodeset.>.?.IBM-850:	ISO-8859-1	! PC (Multi-lingual)
-!HP-UX.?.interchangeCodeset.>.?.IBM-437:	ISO-8859-1	! PC (US)
-HP-UX.?.interchangeCodeset.~.?.ISO-8859-2:	ISO-8859-2	! ISO Latin 2
-HP-UX.?.interchangeCodeset.~.?.ISO-8859-5:	ISO-8859-5	! ISO Latin/Cyrillic
-HP-UX.?.interchangeCodeset.~.?.ISO-8859-6:	ISO-8859-6	! ISO Latin/Arabic
-HP-UX.?.interchangeCodeset.>.?.HP-ARABIC8:	ISO-8859-6	! HP Arabic8
-!HP-UX.?.interchangeCodeset.>.?.IBM-1046:	ISO-8859-6	! PC Arabic Code Set
-HP-UX.?.interchangeCodeset.~.?.ISO-8859-8:	ISO-8859-8	! ISO Latin/Hebrew
-HP-UX.?.interchangeCodeset.>.?.HP-HEBREW8:	ISO-8859-8	! HP Hebrew8
-!HP-UX.?.interchangeCodeset.>.?.IBM-856:	ISO-8859-8	! PC Hebrew
-HP-UX.?.interchangeCodeset.~.?.ISO-8859-7:	ISO-8859-7	! ISO Latin/Greek
-HP-UX.?.interchangeCodeset.>.?.HP-GREEK8:	ISO-8859-7	! HP Greek8
-HP-UX.?.interchangeCodeset.~.?.ISO-8859-9:	ISO-8859-9	! ISO Latin 5
-HP-UX.?.interchangeCodeset.>.?.HP-TURKISH8:	ISO-8859-9	! HP Turkish8
-HP-UX.?.interchangeCodeset.~.?.EUC-JP:		ISO-2022-JP	! Japanese EUC
-HP-UX.?.interchangeCodeset.>.?.HP-SJIS:		ISO-2022-JP	! HP Japanese Shift JIS
-!HP-UX.?.interchangeCodeset.>.?.IBM-932:	ISO-2022-JP	! PC Japanese Shift JIS
-HP-UX.?.interchangeCodeset.>.?.HP-KANA8:	ISO-2022-JP	! HP Japanese Katakana8
-! comment when ISO-2022-KR iconv available
-HP-UX.?.interchangeCodeset.~.?.EUC-KR:		EUC-KR		! Korean EUC KSC 5601
-! uncomment when ISO-2022-KR iconv available
-!HP-UX.?.interchangeCodeset.~.?.EUC-KR:		ISO-2022-KR	! Korean EUC KSC 5601
-! comment when ISO-2022-CN iconv available
-HP-UX.?.interchangeCodeset.>.?.EUC-CN:		EUC-CN		! China Chinese EUC
-HP-UX.?.interchangeCodeset.~.?.HP-15CN:		EUC-CN     	! HP Chinese EUC
-! uncomment when ISO-2022-CN iconv available
-!HP-UX.?.interchangeCodeset.>.?.EUC-CN:		ISO-2022-CN	! China Chinese EUC
-!HP-UX.?.interchangeCodeset.~.?.HP-15CN:	ISO-2022-CN    	! HP Chinese EUC    
-! comment when ISO-2022-TW iconv available
-HP-UX.?.interchangeCodeset.~.?.EUC-TW:		EUC-TW		! Taiwan Chinese EUC
-HP-UX.?.interchangeCodeset.>.?.HP-BIG5:		EUC-TW		! HP Big5 Chinese
-HP-UX.?.interchangeCodeset.>.?.HP-CCDC:		EUC-TW		! HP CCDC Chinese 
-! uncomment when ISO-2022-TW iconv available
-!HP-UX.?.interchangeCodeset.~.?.EUC-TW:		ISO-2022-TW	! Taiwan Chinese EUC
-!HP-UX.?.interchangeCodeset.>.?.HP-BIG5:	ISO-2022-TW	! HP Big5 Chinese
-!HP-UX.?.interchangeCodeset.>.?.HP-CCDC:	ISO-2022-TW	! HP CCDC Chinese
-HP-UX.?.interchangeCodeset.~.?.TIS-620:		TIS-620		! Thai
-HP-UX.?.interchangeCodeset.>.?.UCS-2:		UTF-8		! multibyte encoding of Unicode
-HP-UX.?.interchangeCodeset.~.?.UTF-8:		UTF-8		! multibyte encoding of Unicode
-

cde/lib/DtHelp/HyperText.c

@@ -49,15 +49,11 @@
 #include <errno.h>
 #include <signal.h>
 #include <stdlib.h>
-#ifdef __hpux
-#include <time.h>
-#else /* SUN and IBM */
 #ifdef	_AIX
 #include <sys/select.h>
 #endif
 #include <sys/time.h>
 #include <sys/types.h>
-#endif
 #include <unistd.h>
 #include <sys/wait.h>
 #include <Xm/DialogS.h>
@@ -233,11 +229,7 @@ _DtHelpExecProcedure (
     /*
      * fork a child process.
      */
-#ifdef __hpux
-    childPid = vfork ();
-#else
     childPid = fork ();
-#endif /* __hpux */
 
     /*
      * If the child, exec the cmd with a shell parent

cde/lib/DtHelp/Print.c

@@ -1303,11 +1303,7 @@ void _DtHelpPrintJob(
    }
 #endif
 
-#ifdef __hpux
-   pid = vfork();
-#else
    pid = fork();
-#endif /* __hpux */
  
    if (pid == 0)
    {

cde/lib/DtHelp/StringFuncs.c

@@ -528,11 +528,7 @@ int _DtHelpCeStrHashToKey(
    _CEStrcollProc _DtHelpCeGetStrcollProc(void)
 {
    int Clang = 0;
-#if defined(__hpux)
-   struct locale_data * li;
-#else
    char * locale;
-#endif
 
    extern int strcoll(const char *,const char *);
 #if defined(_AIX)
@@ -544,15 +540,9 @@ int _DtHelpCeStrHashToKey(
 #define C_LANG  "C"
 
    /* if locale is C, use the explicit case insensitive compare */
-#if defined(__hpux)
-   li = getlocale(LOCALE_STATUS);
-   if ( NULL == li->LC_COLLATE_D || strcmp(C_LANG,li->LC_COLLATE_D) == 0 )
-     Clang = 1;
-#else
    locale = setlocale(LC_COLLATE,NULL); /* put locale in buf */
    if (strcmp(locale,C_LANG) == 0)
      Clang = 1;
-#endif
 
    if (Clang)
 #if defined(_AIX)

cde/lib/DtHelp/il/ilversion.c

@@ -33,31 +33,8 @@
    See notes below "ilVersionName".
 */
 
-#ifdef __hpux 
-    IL_PRIVATE 
-   char _ilVersionString[] = "HP IL BETA v 23.  bl08";
-/*                                nnnnn vvvvvv bbbb       see below
-                                  xxxxxxxxxxxxxxxxx       total size = 17 chars
-
-        The above version string *must* maintain the syntax and position of all fields
-        before the ";".  The strings have the following format; each string is 5 chars:
-            nnnnn       A 5 char fixed string equal to "HP IL ".
-            vvvvvv      A 6 char string in the format "v!!.??", where !! is the two-digit
-                        major version number (" n" if less than 10), and ?? is the minor
-                        version number ("n " if less than 10).  Examples: "v10.12",
-                        "v 9.6 ".
-            bbbbb       A 4 char string in the format "bl??", where ?? is the baselevel
-                        number (e.g. "bl01", "bl56").
-
-*/
-
-#else
-
     IL_PRIVATE
    char _ilVersionString[] = "@(#)HP IL v 2.1  bl06; Image Library for Domain/OS SR10.X 'il'";
 /*                                nnnnn vvvvvv bbbb       see above
                                   xxxxxxxxxxxxxxxxx       total size = 17 chars
 */
-
-#endif
-

cde/lib/DtHelp/libDtHelp.elist

@@ -112,7 +112,7 @@ private _DtHelpCeFindKeyword
 private _DtHelpCeXlateOpToStdLocale
 private _DtHelpCeXlateStdToOpLocale
 private _DtHelpCeGetDocStamp
-#if !defined(sun) && !defined(__hpux)
+#if !defined(sun)
 private _DtHelpCeStrCaseCmp
 #endif
 
@@ -147,28 +147,6 @@ private _DtGrRead
 private _DtHelpCeGetTopTopicId
 private _DtHelpCeIsTopTopic
 
-/*****************************************************************************
- **** Private const structures.
- **** On HP machines, these core dump if compiled +ESlit and not included
- **** in the export list.
- *****************************************************************************/
-#if 0
-#ifdef __hpux
-private  ilBitonal0WhiteImageDes
-private  ilGray256ImageDes
-private  ilRGB256ImageDes
-private  ilPaletteImageDes
-private  ilYCbCrImageDes
-private  ilYCbCr2ImageDes
-
-private  ilBitImageFormat
-private  ilByteImageFormat
-private  il3BytePixelImageFormat
-private  il3BytePlaneImageFormat
-#endif   /* ifdef __hpux */
-#endif
-
-
 /*****************************************************************************
  **** Internal symbols nobody should call from outside DtHelp
  *****************************************************************************/

cde/lib/DtMmdb/HardCopy/TemplatesAutoNumber.C

@@ -35,7 +35,7 @@
 
 #endif /* end of CDE_NEXT */
 
-#if defined(sun) || defined(hpux)
+#if defined(sun)
 
 #ifndef CDE_NEXT /* { */
 

cde/lib/DtMmdb/StyleSheet/Debug.h

@@ -57,7 +57,7 @@ using namespace std;
 
 
 #ifdef DEBUG
-#if !defined ( __STDC__) && !defined (hpux)
+#if !defined ( __STDC__)
 #define debug(s, x)  s <<  "x" << " = " << (x) << "\n"
 #else
 #define debug(s, x)  s << #x << " = " << (x) << "\n"

cde/lib/DtMmdb/StyleSheet/SSTemplates.C

@@ -69,7 +69,7 @@ typedef Stack<FeatureSet*,dlist_array<FeatureSet> > _stack_fs_orvec_fs_;
 // the largest ID used in f's: 59
 //
 
-#if defined(sun) || defined(hpux)
+#if defined(sun)
 typedef CC_TPtrSlist<Attribute> _f4_;
 typedef CC_TPtrSlist<Feature>   _f5_;
 typedef CC_TPtrSlist<PathFeature> _f2_;

cde/lib/DtMmdb/dti_excs/Destructable_il.hh

@@ -98,7 +98,7 @@ Destructable::~Destructable()
 // This code relies on the fact that in cfront 2.1 this qualified
 // call to the destructor will actually call the virtual destructor. 
 
-#if !defined(hpux) && (CC_VERSION < 30)
+#if (CC_VERSION < 30)
 inline void
 Destructable::destruct()
 {

cde/lib/DtMmdb/dti_excs/Exception.hh

@@ -31,10 +31,6 @@ class Exception : public Destructable
 public:
 #ifdef NATIVE_EXCEPTIONS
 
-#if defined(hpux)
-  Exception() { }
-#endif
-
 #else
   Exception();
 
@@ -106,10 +102,6 @@ protected:
 friend class Jump_Environment;
 friend class Exceptions;
 
-#if defined(hpux)
-#define MakeOperatorNewPublic
-#endif
-
 #ifdef MakeOperatorNewPublic
 // A problem with the HP-UX 3.65 compiler requires us to make this public.
 // And, since we gen the Templates.nd.c file on a non-HPUX platform, we need

cde/lib/DtMmdb/dti_excs/Exceptions.hh

@@ -66,7 +66,7 @@ extern "C" {
 #endif
 
 #ifndef STRINGIFY
-#if !defined(__STDC__) && !defined(hpux)
+#if !defined(__STDC__)
 #define STRINGIFY(S) "S"
 #else
 #define STRINGIFY(S) #S
@@ -130,13 +130,8 @@ extern "C" {
 
 // This works if OBJ is an object or a pointer since Exception objects
 // overload operator ->.
-#if !defined(hpux)
 #define mthrow(OBJ) \
   (OBJ)->throw_it (__LINE__, __FILE__, DEBUG_THROW_FLAG)
-#else
-#define mthrow(OBJ) \
-  OBJ->throw_it (__LINE__, __FILE__, DEBUG_THROW_FLAG)
-#endif
 
 #define rethrow \
   Exception::current_exception().do_throw (__LINE__, __FILE__)

cde/lib/DtMmdb/dti_excs/terminate.C

@@ -63,11 +63,4 @@ terminate()
   abort();
 }
 #else
-
-#ifdef hpux
-// HPUX doesn't define the set_terminate function from the ARM. 
-typedef void (*PFV)();
-PFV set_terminate (PFV) { return (0); }
-#endif
-
 #endif /* NATIVE_EXCEPTIONS */

cde/lib/DtMmdb/misc/unique_id.c

@@ -97,22 +97,7 @@ static unsigned int mask[] =
       (bits & (1L << (sizeof(BITS) * 8)-1)) ? putchar('1') : putchar('0'); } \
     putchar ('\n'); } 
 
-#if defined(hpux)
-#include <sys/utsname.h>
-static unsigned int
-gethostid()
-{
-  struct utsname u;
-  int i;
-
-  i=uname(&u);
-  if (i==-1)
-    abort();
-  if (u.idnumber[0])
-    return atoi(u.idnumber);
-  abort();
-}
-#elif defined(SVR4) && !defined(sun)
+#if defined(SVR4) && !defined(sun)
 static unsigned int
 gethostid()
 {

cde/lib/DtMmdb/misc/unique_id.h

@@ -29,7 +29,7 @@
 extern "C" {
 #endif
 
-#if defined( __STDC__ ) || defined( _HPUX_SOURCE )
+#if defined( __STDC__ )
 const char *unique_id(void);
 #else
 char *unique_id();

cde/lib/DtMmdb/oliasdb/c_api.C

@@ -25,15 +25,6 @@
 #include "oliasdb/DtMmdb.h"
 #include <stdio.h>
 
-#if ( ARCH == hpux)
-extern "C"
-char __pure_virtual_called()
-{
-   return 0;
-}
-#endif
-
-
 #ifdef DEBUG
 
 extern "C"

cde/lib/DtMmdb/oliasdb/c_api_pure_virtual.C

@@ -28,22 +28,13 @@
 
 extern "C" {
 
-#if defined(hpux)
-char __pure_virtual_called()
-{
-   fprintf(stderr, "DtMmdb: pure virtual called\n");
-   exit (-1);
-   return 0;
-}
-#else
 #if defined(SVR4) && defined(SC3)
 void _pure_error_()
 {
    fprintf(stderr, "DtMmdb: pure virtual called\n");
    exit (-1);
 }
-#else
-#ifdef _AIX
+#elif _AIX
 void __PureVirtualCalled()
 {
    fprintf(stderr, "DtMmdb: pure virtual called\n");
@@ -57,8 +48,6 @@ void __pure_virtual_called()
    exit (-1);
 }
 
-#endif
-#endif
 #endif
 
 }

cde/lib/DtMmdb/schema/desc.h

@@ -59,7 +59,7 @@
 #define desc_print3(s, n, x)  s << "	" << n << "=" << (x) << ":\\" << endl
 #define desc_print_end3(s, n, x)  s << "	" << n << "=" << (x) << endl
 
-#if !defined ( __STDC__) && !defined (hpux)
+#if !defined ( __STDC__)
 #define desc_print(s, x)  s << "	" << "x" << "=" << (x) << ":\\\n"
 #define desc_print_end(s, x)  s << "	" << "x" << "=" << (x) << "\n"
 #else

cde/lib/DtMmdb/utility/debug.h

@@ -48,7 +48,7 @@
 
 #ifdef DEBUG
 
-#if !defined ( __STDC__) && !defined (hpux)
+#if !defined ( __STDC__)
 #define debug(s, x)  s <<  "x" << " = " << (x) << "\n"
 #else
 #define debug(s, x)  s << #x << " = " << (x) << "\n"

cde/lib/DtMmdb/utility/filebuf.C

@@ -26,7 +26,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#if !defined(hpux) && !defined(__linux__) && !defined(CSRG_BASED) && !defined(sun)
+#if !defined(__linux__) && !defined(CSRG_BASED) && !defined(sun)
 #include <sysent.h>
 #endif
 

cde/lib/DtMmdb/utility/funcs.C

@@ -741,7 +741,7 @@ Boolean cc_is_digit(istream& in)
 
 unsigned long disk_space(const char* path)
 {
-#if defined (hpux) || defined (SVR4) || defined(CSRG_BASED)
+#if defined (SVR4) || defined(CSRG_BASED)
    struct statvfs statfs_buf;
 #else
    struct statfs statfs_buf;
@@ -749,7 +749,7 @@ unsigned long disk_space(const char* path)
 
    long free_bytes;
 
-#if defined (hpux) || defined (SVR4) || defined(CSRG_BASED)
+#if defined (SVR4) || defined(CSRG_BASED)
    if ( statvfs(path, &statfs_buf) == 0 ) {
       free_bytes = statfs_buf.f_bavail * statfs_buf.f_frsize ;
 #else

cde/lib/DtMmdb/utility/funcs.h

@@ -55,8 +55,7 @@
 #if !defined(__linux__) && !defined(CSRG_BASED) && !defined(sun)
 #include <libc.h>
 #endif
-#if defined(hpux) || defined(sgi) || \
-    defined(__linux__) || defined(CSRG_BASED) || defined(sun)
+#if defined(__linux__) || defined(CSRG_BASED) || defined(sun)
 #include <unistd.h>
 #else
 #include <sysent.h>

cde/lib/DtMrm/DtMrm.c

@@ -85,10 +85,6 @@ static char rcsid[] = "$TOG: DtMrm.c /main/4 1999/10/14 13:35:44 mgreess $"
  *  INCLUDE FILES
  *
  */
-#if defined(__hpux)
-#include <sys/param.h>
-#endif
-
 #include <X11/IntrinsicP.h>
 #include <Xm/Xm.h>
 #include <Mrm/MrmPublic.h>

cde/lib/DtSearch/libDtSearch.elist

@@ -416,10 +416,6 @@ internal yylex
 internal yynerrs
 internal yyparse
 
-#if defined(hpux)
-internal yymaxdepth
-#endif
-
 #if defined(sun)
 internal yy_yys
 internal yy_yyv

cde/lib/DtSvc/DtEncap/pty.c

@@ -35,14 +35,6 @@
 
 #define __need_fd_set
 
-#if  defined(hpux) || defined(_hpux) || defined(__hpux) || defined(hp)
-#define __hpux_pty
-#endif
-
-#ifdef __hpux_pty
-#define __need_timeval  /* need struct timeval */
-#endif
-
 #include <bms/sbport.h> /* NOTE: sbport.h must be the first include. */
 #include <errno.h>
 #include <stdlib.h>
@@ -56,11 +48,6 @@
 #include <sys/ioctl.h>
 #endif
 
-#ifdef __hpux_pty
-#include <time.h>
-#include <sys/ptyio.h>
-#endif
-
 #ifdef __bsd
 #include <sys/file.h>
 #include <sgtty.h>
@@ -165,28 +152,6 @@ pty_channel_clasp pty_channel_class = &pty_channel_class_struct;
 /* Local variable */
 static XeChar *hexdigits = "0123456789abcdef";
 
-#ifdef __hpux_pty
-/*----------------------------------------------------------------------+*/
-static SPC_Disable_Trapping(int fd)
-/*----------------------------------------------------------------------+*/
-{
-  int flag=0;
-  int disable=0;
-  struct request_info req_info;
-
-  /* Disable trapping */
-  ioctl(fd, TIOCTRAP, &disable);
-
-  /* Just in case, flush any queued requests */
-  
-  while((ioctl(fd, TIOCTRAPSTATUS, &flag) != ERROR) && flag) {
-    ioctl(fd, TIOCREQGET, &req_info);
-    ioctl(fd, TIOCREQSET, &req_info);
-  }
-  return(TRUE);
-}
-#endif /* __hpux_pty */
-
 /*
  * Routines for opening pty master/slave devices
  */
@@ -384,14 +349,6 @@ int master_pty(int fd, struct termios *state)
   if (fd < 0)
     return(TRUE);
   
-#ifdef __hpux_pty
-  /* Enable trapping of ioctl/open/close (we care about close()) */
-  if(ioctl(fd, TIOCTRAP, &enable)==ERROR) {
-    SPC_Error(SPC_Bad_Ioctl);
-    return(SPC_ERROR);
-  }
-#endif /* __hpux_pty */  
-
   set_pty_state(fd, state);
 
 
@@ -510,91 +467,6 @@ int read_pty_channel_object(SPC_Channel_Ptr channel,
 			    XeString buffer,
 			    int nbytes)
 /*----------------------------------------------------------------------+*/
-#ifdef __hpux_pty
-{
-  
-  int result, select_value;
-  struct fd_set read_mask, except_mask;
-  int fd=channel->file_descs[connector];
-  struct request_info req_info;
-  struct timeval timeout, *timeptr;
-  int i;
- 
-  call_parent_method(channel,
-		     read,
-		     (channel, connector, buffer, nbytes),
-		     result);
-  
-  if(result==SPC_ERROR)
-    return(SPC_ERROR);
-
-  if(!IS_SPCIO_DATA(channel->wires[connector]->flags))
-    return(0);
-
-  FD_ZERO(&read_mask);
-  FD_ZERO(&except_mask);
-
-  FD_SET(fd, &read_mask);
-  FD_SET(fd, &except_mask);
-  
-  if(channel->close_timeout) {
-    timeout.tv_sec=channel->close_timeout;
-    timeout.tv_usec=0;
-    timeptr = (&timeout);
-  } else
-    timeptr=NULL;
-
-  do
-    select_value=select(fd+1, &read_mask, NULL, &except_mask, timeptr);
-  while(select_value==ERROR && errno==EINTR);
-  
-  if(select_value==ERROR) {
-    SPC_Error(SPC_Bad_Select);
-    return(SPC_ERROR);
-  }
-
-  /* If there is anything to read, read it & return */
-  IS_FD_SET(&read_mask, result);
-  if(result) {
-    do {
-      result = read(fd, buffer, nbytes);
-    } while (result<0 && errno == EINTR);
-    if(result==ERROR) {
-      SPC_Error(SPC_Reading);
-      return(SPC_ERROR);
-    }
-    return(result);
-  }
-  
-  /* Nothing to read.  We either timed out or got an exception. */
-  
-  if(select_value != 0) {
-
-    /* We got an exception */
-    ioctl(fd, TIOCREQGET, &req_info);
-    
-    /* Clear the request (Not really necessary in the case of a close,
-       but do it anyway) */
-    
-    ioctl(fd, TIOCREQSET, &req_info);
-  }
-
-  if((select_value == 0) || (req_info.request == TIOCCLOSE)) {
-
-    /* Close, disable trapping on this fd & return EOF.  We regard
-       a timeout as being the same as a close. */
-
-    SPC_Disable_Trapping(fd);
-    SPC_Change_State(channel, connector, 0, -1);
-    return(0);
-
-  } else
-
-    /* Otherwise (open or IOCTL), return -1 */
-
-    return(EXCEPT_FLAG);
-}
-#else /* not __hpux_pty */
 {
   int result;
   int fd=channel->file_descs[connector];
@@ -648,7 +520,6 @@ int read_pty_channel_object(SPC_Channel_Ptr channel,
 
   return(result);
 }
-#endif /* __hpux_pty */
 
 /*----------------------------------------------------------------------+*/
 int pre_fork_pty_channel_object(SPC_Channel_Ptr channel)
@@ -671,38 +542,14 @@ int pre_fork_pty_channel_object(SPC_Channel_Ptr channel)
       result=SPC_ERROR;
   }
 
-#ifndef __hpux_pty
   if(pipe(channel->sync_pipe) < 0) {
     SPC_Error(SPC_No_Pipe);
     return(SPC_ERROR);
   }
-#endif /* __hpux_pty */
 
   return(result);
 }
 
-#ifdef __hpux_pty
-/*----------------------------------------------------------------------+*/
-/* clear_trap */
-/*----------------------------------------------------------------------+*/
-
-/* I am not particularly enamored of this macro.  However, the style of
-   the SCANBITS macro kinda forces me to write it this way.  In particular,
-   I am a bit worried about the reference to except_mask, which is a
-   "nonlocal reference" */
-
-#define clear_trap(fd)  {struct request_info req_info;        \
-			 int my_fd=(fd);                      \
-			 ioctl(my_fd, TIOCREQGET, &req_info); \
-			   if(req_info.request != TIOCOPEN) { \
-                             SPC_Error(SPC_Bad_Ioctl);        \
-			     return(SPC_ERROR);               \
-			    }                                 \
-			 ioctl(my_fd, TIOCREQSET, &req_info); \
-                         FD_CLR(my_fd, &except_mask);         \
-			 }
-#endif /* __hpux_pty */
-
 /*----------------------------------------------------------------------+*/
 int post_fork_pty_channel_object(SPC_Channel_Ptr channel,
 				 int parentp)
@@ -714,9 +561,6 @@ int post_fork_pty_channel_object(SPC_Channel_Ptr channel,
   int iomode=channel->IOMode;
   int fd=channel->file_descs[STDIN];
   int stdinfd, stdoutfd, stderrfd;
-#ifdef __hpux_pty
-  struct fd_set except_mask, temp_mask;
-#endif
   int pid;
   char c;
       
@@ -726,40 +570,12 @@ int post_fork_pty_channel_object(SPC_Channel_Ptr channel,
     return(SPC_ERROR);
   
   if (parentp) {		/* Master process */
-#ifdef __hpux_pty
-    { int i;
-      int select_value;
-      
-      stdinfd  = channel->wires[STDIN]->fd[MASTER_SIDE];
-      stdoutfd = channel->wires[STDOUT]->fd[MASTER_SIDE];
-      stderrfd = channel->wires[STDERR]->fd[MASTER_SIDE];
-
-      FD_ZERO(&except_mask);
-      
-      if(stdinfd >= 0)
-	FD_SET(stdinfd, &except_mask);
-      if(stdoutfd >= 0)
-	FD_SET(stdoutfd, &except_mask);
-      if(stderrfd >= 0)
-	FD_SET(stderrfd, &except_mask);
-      
-      IS_FD_SET(&except_mask, result);
-      while (result) {
-	temp_mask = except_mask;
-	select_value=select(max_fds, NULL, NULL, &temp_mask, NULL);
-	SCANBITS(&temp_mask, clear_trap);
-	IS_FD_SET(&except_mask, result);
-      }
-    }
-#else				/* not __hpux_pty */
     close(channel->sync_pipe[WRITE_SIDE]);
     read(channel->sync_pipe[READ_SIDE], &c, 1);
     close(channel->sync_pipe[READ_SIDE]);
     channel->sync_pipe[READ_SIDE] = -1;
     channel->sync_pipe[WRITE_SIDE] = -1;
     XeSPCAddInput(channel, NULL, NULL);    
-#endif				/* __hpux_pty */
-  
   } else {			/* Slave process */
 
     /* Open the slave pty. Do it up to three times to set up
@@ -811,14 +627,12 @@ int post_fork_pty_channel_object(SPC_Channel_Ptr channel,
 	stderrfd=stdoutfd;
     }
 
-#ifndef __hpux_pty
     /* The pty trapping stuff handles EOF for us.  Use the "sync" pipe */
     /* to inform the other side when we don't have that code.          */
     c=040;
     write(channel->sync_pipe[WRITE_SIDE], &c, 1);
     close(channel->sync_pipe[READ_SIDE]);
     close(channel->sync_pipe[WRITE_SIDE]);
-#endif				/* __hpux_pty */
 
     /* Duplicate these file descriptors to 3, 4, 5 so we don't have to
        worry about any of std[in|out|err]fd being 0, 1, or 2. */
@@ -863,15 +677,6 @@ int reset_pty_channel_object(SPC_Channel_Ptr channel)
   
   for(wirelist=channel->wire_list; wirelist; wirelist=wirelist->next) {
     
-#ifdef __hpux_pty
-  {
-    int fd=wirelist->fd[MASTER_SIDE];
-    /* Disable trapping of ioctl/open/close */
-    if(SPC_Disable_Trapping(fd) == SPC_ERROR)
-	result=SPC_ERROR;
-  }
-#endif /* __hpux_pty */    
-
     wirelist->flags &= ~SPCIO_DATA;
   }
 
@@ -925,13 +730,6 @@ int add_input_pty_channel_object(SPC_Channel_Ptr channel,
 		   fd,
 		   channel->class_ptr->input,
 		   SPC_Input);
-#ifdef __hpux_pty
-    SPC_XtAddInput(channel,
-		   &wirelist->except_toolkit_id,
-		   fd,
-		   channel->class_ptr->input,
-		   SPC_Exception);
-#endif /* __hpux_pty */
   }
   
   return(TRUE);

cde/lib/DtSvc/DtEncap/spc-exec.c

@@ -603,11 +603,7 @@ int exec_proc_local_channel_object(SPC_Channel_Ptr channel)
 	if(result!=SPC_ERROR) {
 	    /* Execute */
 	    /* Compiler barfs without cast ? */
-#if defined(__hpux_8_0) || defined(__aix)
-            result=execvp(channel->path, channel->argv);
-#else
 	    result=execvp(channel->path, channel->argv);
-#endif
 	    /* If we return from exec, it failed */
 	    SPC_Error(SPC_Cannot_Exec, channel->path);
 	}

cde/lib/DtSvc/DtEncap/usersig.c

@@ -90,55 +90,55 @@ static void Xe_init_sig_table(void)
     /* Now add signals that may or may not be around on a given platform */    
 
 #   ifdef SIGIO    
-    Xe_addsig((XeString)"SIGIO", SIGIO);  		/*  hpux sun */
+    Xe_addsig((XeString)"SIGIO", SIGIO);  		/*   sun */
 #   else
 #       ifdef SIGPOLL
-           Xe_addsig((XeString)"SIGIO", SIGPOLL);  	/*  hpux sun */
+           Xe_addsig((XeString)"SIGIO", SIGPOLL);  	/*   sun */
 #       endif
 #    endif
 
 #   ifdef SIGPOLL    
-    Xe_addsig((XeString)"SIGPOLL", SIGPOLL);  		/*  hpux sun */
+    Xe_addsig((XeString)"SIGPOLL", SIGPOLL);  		/*   sun */
 #   else
 #       ifdef SIGIO
-           Xe_addsig((XeString)"SIGPOLL", SIGIO);  	/*  hpux sun */
+           Xe_addsig((XeString)"SIGPOLL", SIGIO);  	/*   sun */
 #       endif
 #   endif
 
 #   ifdef SIGEMT    
-    Xe_addsig((XeString)"SIGEMT", SIGEMT);  		/*  hpux sun */
+    Xe_addsig((XeString)"SIGEMT", SIGEMT);  		/*   sun */
 #   endif
 
 #   ifdef SIGBUS    
-    Xe_addsig((XeString)"SIGBUS", SIGBUS);  		/*  hpux sun */
+    Xe_addsig((XeString)"SIGBUS", SIGBUS);  		/*   sun */
 #   endif
 
 #   ifdef SIGIOT    
-    Xe_addsig((XeString)"SIGIOT", SIGIOT);  		/*  hpux sun */
+    Xe_addsig((XeString)"SIGIOT", SIGIOT);  		/*   sun */
 #   endif
 
 #   ifdef SIGURG    
-    Xe_addsig((XeString)"SIGURG", SIGURG);  		/*  hpux sun */
+    Xe_addsig((XeString)"SIGURG", SIGURG);  		/*   sun */
 #   endif
 
 #   ifdef SIGSYS    
-    Xe_addsig((XeString)"SIGSYS", SIGSYS);  		/*  hpux sun */
+    Xe_addsig((XeString)"SIGSYS", SIGSYS);  		/*   sun */
 #   endif
 
 #   ifdef SIGTRAP    
-    Xe_addsig((XeString)"SIGTRAP", SIGTRAP);  		/*  hpux sun */
+    Xe_addsig((XeString)"SIGTRAP", SIGTRAP);  		/*   sun */
 #   endif
 
 #   ifdef SIGPROF    
-    Xe_addsig((XeString)"SIGPROF", SIGPROF);  		/*  hpux sun */
+    Xe_addsig((XeString)"SIGPROF", SIGPROF);  		/*   sun */
 #   endif
 
 #   ifdef SIGCLD    
-    Xe_addsig((XeString)"SIGCLD", SIGCLD);  		/*  hpux sun */
+    Xe_addsig((XeString)"SIGCLD", SIGCLD);  		/*   sun */
 #   endif
 
 #   ifdef SIGVTALRM    
-    Xe_addsig((XeString)"SIGVTALRM", SIGVTALRM);  	/*  hpux sun */
+    Xe_addsig((XeString)"SIGVTALRM", SIGVTALRM);  	/*   sun */
 #   endif
 
 #   ifdef SIGWINCH
@@ -204,56 +204,56 @@ XeString XeSignalToName(int sig)
     /*       code to the stuff in Xe_init_sig_table() above, you see a one   */
     /*       to one correspondance.					     */
      
-#   ifdef SIGIO    		 		/*  hpux sun */
+#   ifdef SIGIO    		 		/*   sun */
 	                                        /*  (SIGPOLL, SIGTINT are aliases) */
     case SIGIO:		return (XeString)"SIGIO"; 
 #   endif
 
-#   ifdef SIGPOLL    				/*  hpux sun */
+#   ifdef SIGPOLL    				/*   sun */
 /*  ----> Duplicated by SIGIO above
     case SIGPOLL:	return (XeString)"SIGPOLL";  	
 */
 #   endif
 
 
-#   ifdef SIGEMT    				/*  hpux sun */
+#   ifdef SIGEMT    				/*   sun */
     case SIGEMT:	return (XeString)"SIGEMT";  	
 #   endif
 
-#   ifdef SIGBUS    				/*  hpux sun */
+#   ifdef SIGBUS    				/*   sun */
     case SIGBUS:	return (XeString)"SIGBUS";  	
 #   endif
 
-#   ifdef SIGIOT    				/*  hpux sun */
+#   ifdef SIGIOT    				/*   sun */
 /*  ----> Duplicated by SIGABRT above
 
     case SIGIOT:	return (XeString)"SIGIOT";  	
 */
 #   endif
 
-#   ifdef SIGURG    				/*  hpux sun */
+#   ifdef SIGURG    				/*   sun */
     case SIGURG:	return (XeString)"SIGURG";  	
 #   endif
 
-#   ifdef SIGSYS    				/*  hpux sun */
+#   ifdef SIGSYS    				/*   sun */
     case SIGSYS:	return (XeString)"SIGSYS";  	
 #   endif
 
-#   ifdef SIGTRAP    				/*  hpux sun */
+#   ifdef SIGTRAP    				/*   sun */
     case SIGTRAP:	return (XeString)"SIGTRAP";  	
 #   endif
 
-#   ifdef SIGPROF    				/*  hpux sun */
+#   ifdef SIGPROF    				/*   sun */
     case SIGPROF:	return (XeString)"SIGPROF";  	
 #   endif
 
-#   ifdef SIGCLD    				/*  hpux sun */
+#   ifdef SIGCLD    				/*   sun */
 /*  ----> Duplicated by SIGCHLD above
     case SIGCLD:	return (XeString)"SIGCLD";  	
 */
 #   endif
 
-#   ifdef SIGVTALRM    				/*  hpux sun */
+#   ifdef SIGVTALRM    				/*   sun */
     case SIGVTALRM:	return (XeString)"SIGVTALRM";  	
 #   endif
 

cde/lib/DtSvc/DtUtil1/CmdMain.c

@@ -73,14 +73,6 @@
  */
 #define COMMAND_CHECK_FAILURE           1
 
-#ifdef __hpux
-#ifdef hpV4
-#define INETD_SECURITY_FILE	"/var/adm/inetd.sec"
-#else /* hpV4 */
-#define INETD_SECURITY_FILE	"/usr/adm/inetd.sec"
-#endif /* hpV4 */
-#endif /* __hpux */
-
 #define Cmd_FreeAllocatedStringVector(sv) \
 		_DtCmdFreeStringVector(sv);\
 		XtFree((char *)sv);
@@ -337,24 +329,11 @@ _DtSPCOpen(
 						SPC_BUFSIZ);
 				break;
 			case SPC_Connection_EOF:
-#ifdef __hpux
-				(void) sprintf (errorMessage, 
-						errorInetSecurity,
-						hostname,
-						_cmdClientHost,
-						SPC_SERVICE,
-						_cmdClientHost,
-						SPC_SERVICE,
-						INETD_SECURITY_FILE,
-						hostname);
-
-#else /* __hpux */
 				(void) sprintf (errorMessage, 
 						errorBadConnect,
 						hostname,
 						SPC_SERVICE,
 						_cmdClientHost);
-#endif /* __hpux */
 				break;
 			default:
 				/*

cde/lib/DtSvc/DtUtil1/CmdProcess.c

@@ -45,10 +45,6 @@
 #include <limits.h>
 #endif 
 
-#if defined(__hpux)
-#include <sys/getaccess.h>
-#endif
-
 #include <sys/socket.h>
 #include <netdb.h>
 #include <netinet/in.h>

cde/lib/DtSvc/DtUtil1/DbLoad.c

@@ -49,18 +49,12 @@
 #include <stdio.h>
 #include <sys/types.h>
 
-#ifdef __hpux
-#include <ndir.h>
-#else
-
 #if defined(sun) || defined(CSRG_BASED)
 #include <dirent.h>
 #else
 #include <sys/dir.h>
 #endif				/* sun || CSRD_BASED */
 
-#endif				/* __hpux */
-
 #include <ctype.h>
 #include <string.h>
 

cde/lib/DtSvc/DtUtil1/Dts.c

@@ -54,12 +54,7 @@
 #include <stdio.h>
 #include <fcntl.h>
 #include <sys/stat.h>
-#if defined (__hpux)
-/*
- * On HP MAXINT is defined in both <values.h> and <sys/param.h>
- */
-#undef MAXINT
-#elif defined(CSRG_BASED)
+#if defined(CSRG_BASED)
 #define MAXINT INT_MAX
 #else
 #include <values.h>

cde/lib/DtSvc/DtUtil1/DtsInit.c

@@ -47,18 +47,12 @@
 #include <stdio.h>
 #include <sys/types.h>
 
-#ifdef __hpux
-#include <ndir.h>
-#else
-
 #if defined(sun) || defined(CSRG_BASED)
 #include <dirent.h>
 #else
 #include <sys/dir.h>
 #endif				/* sun || CSRG_BASED */
 
-#endif				/* __hpux */
-
 #include <ctype.h>
 #include <string.h>
 

cde/lib/DtSvc/DtUtil2/FileUtil.c

@@ -37,15 +37,11 @@
 #include <sys/param.h>		/* MAXPATHLEN */
 #include <errno.h>		/* errno(2) */
 
-#ifdef __hpux
-#include <ndir.h>		/* opendir(), directory(3C) */
-#else
 #if defined(sun) || defined(CSRG_BASED)
 #include <dirent.h>		/* opendir(), directory(3C) */
 #else
 #include <sys/dir.h>
 #endif /* sun || CSRG_BASED */
-#endif /* __hpux */
 
 #include <X11/Xlib.h>
 #include <X11/Intrinsic.h>	/* Xt stuff */

cde/lib/DtSvc/DtUtil2/MsgCat.c

@@ -44,116 +44,10 @@
 #else
 #include <X11/Intrinsic.h>
 #include <DtSvcLock.h>
-#endif /* NO_XLIB */
+#endif
 
 #include <Dt/MsgCatP.h>
 
-#if defined(hpV4) && !defined(NO_XLIB)
-typedef struct _dt_msg_cache
-{
-    char ***cached_msgs;
-    int     nmsgs_per_set;
-    int     nsets;
-
-    nl_catd catd;
-    struct _dt_msg_cache *next;
-} _DtMsgCache;
-
-static _DtMsgCache	*catalog_message_caches = NULL;
-
-static _DtMsgCache *get_msg_cache(nl_catd catd)
-{
-    const int initial_nmsgs_per_set = 300;
-    const int initial_nsets         = 50;
-
-    _DtMsgCache *c;
-
-    for (c=catalog_message_caches; NULL!=c; c=c->next)
-      if (catd == c->catd) return c;
-
-    c = (_DtMsgCache*) XtMalloc(sizeof(_DtMsgCache));
-    c->cached_msgs = NULL;
-    c->nmsgs_per_set = initial_nmsgs_per_set;
-    c->nsets = initial_nsets;
-    c->catd = catd;
-    c->next = catalog_message_caches;
-    catalog_message_caches = c;
-    return c;
-}
-
-/*
- * Wrapper around catgets -- this makes sure the message string is saved
- * in a safe location; so repeated calls to catgets() do not overwrite
- * the catgets() internal buffer.  This has been a problem on HP systems.
- */
-char *_DtCatgetsCached(nl_catd catd, int set, int num, const char *dflt)
-{
-    char	*message = NULL;
-    _DtMsgCache	*c;
-    char	**setptr;
-    int		i, multiplier;
-    int		size;
-
-    /* convert to a zero based index */
-    int		setIdx = set - 1;
-    int		numIdx = num - 1;
-
-    c = get_msg_cache(catd);
-    if (NULL == c) 
-    {
-        message = catgets(catd, set, num, dflt);
-	return message;
-    }
-
-    if (NULL == c->cached_msgs)
-    {
-        size = sizeof(char**) * c->nsets;
-        c->cached_msgs = (char***) XtMalloc(size);
-        memset((char*) c->cached_msgs, 0, size);
-    }
-    else if (setIdx >= c->nsets)
-    {
-        for (multiplier=2; setIdx > multiplier*c->nsets; multiplier++) {}
-        size = sizeof(char**) * c->nsets;
-        c->cached_msgs =
-	  (char***) XtRealloc((char*) c->cached_msgs, multiplier*size);
-        memset((char*) (c->cached_msgs + size), 0, multiplier*size);
-        c->nsets *= multiplier;
-    }
-
-    if (NULL == c->cached_msgs[setIdx])
-    {
-        size = sizeof(char*) * c->nmsgs_per_set;
-        c->cached_msgs[setIdx] = (char**) XtMalloc(size);
-        memset((char*) c->cached_msgs[setIdx], 0, size);
-    }
-    else if (numIdx >= c->nmsgs_per_set)
-    {
-        for (multiplier=2; numIdx > multiplier*c->nsets; multiplier++) {}
-        size = sizeof(char*) * c->nmsgs_per_set;
-  
-        for (i=0; i<c->nmsgs_per_set; i++)
-        {
-	    if (NULL != c->cached_msgs[i])
-	    {
-                c->cached_msgs[i] =
-		  (char**) XtRealloc((char*)c->cached_msgs[i], multiplier*size);
-                memset((char*) (c->cached_msgs[i] + size), 0, multiplier*size);
-	    }
-        }
-        c->nmsgs_per_set *= multiplier;
-    }
-
-    setptr = c->cached_msgs[setIdx];
-    if (NULL == setptr[numIdx])
-      setptr[numIdx] = strdup(catgets(catd, set, num, dflt));
-  
-    message = setptr[numIdx];
-
-    return message;
-}
-#endif /* hpV4 */
-
 int _DtCatclose(nl_catd catd)
 {
     return (catd == (nl_catd) -1) ? 0 : catclose(catd);
@@ -169,11 +63,7 @@ char *_DtCatgets(nl_catd catd, int set, int num, const char *dflt)
     } else {
       /* Per POSIX, we cannot assume catgets() is thread-safe. */
       _DtSvcProcessLock();
-#if defined(hpV4) && !defined(NO_XLIB)
-      msg = _DtCatgetsCached(catd, set, num, dflt);
-#else
       msg = catgets(catd, set, num, dflt);
-#endif /* hpV4 */
       _DtSvcProcessUnlock();
     }
 

cde/lib/DtSvc/DtUtil2/Utility.c

@@ -35,15 +35,11 @@
 #include <stdio.h>
 #include <sys/types.h>
 
-#ifdef __hpux
-#include <ndir.h>
-#else
 #if defined(sun) || defined(CSRG_BASED)
 #include <dirent.h>
 #else
 #include <sys/dir.h>
 #endif
-#endif
 
 #include <ctype.h>
 #ifdef NLS16

cde/lib/DtSvc/include/codelibs/stringx.h

@@ -124,11 +124,11 @@ inline void  strfree(const char *s)
 	{ if (s != NULL) free((char *)s); }
 #else
 inline void  strfree(const char *s)
-#if defined(__hpux) || defined(CSRG_BASED)
+#if defined(CSRG_BASED)
 	{ if (s != NULL) free((void *)s); }
 #else
 	{ if (s != NULL) free((void *)s); }
-#endif /* __hpux */
+#endif /* bsd */
 #endif
 #if defined(bsd)
 inline char *strdup(const char *s)

cde/lib/DtSvc/libDtSvc.elist

@@ -1106,10 +1106,7 @@ internalC++ xalloc::xalloc(const char*,unsigned int)
 #endif
 
 /* This symbol does not get mangled consistently across platforms.
-#ifdef hpV4
-internalC++ shellscan_C_000046c7_parsemeta_:__std
-internal __link__std__shellscan_C_000046c7_parsemeta_
-#elif defined(sun)
+#if defined(sun)
 internalC++ shellscan_C:__std
 #elif defined(_AIX)
 internalC++ __sterm80000000_x_2fproj_2fcde_2flib_2fDtSvc_2fDtCodelibs_2fshellscan_2eC()

cde/lib/DtTerm/Term/TermParse.c

@@ -49,12 +49,6 @@
 #include "TermPrimUtil.h"
 #include "TermPrimParseTable.h"
 
-#if defined (__hpux)
-/*
- * On HP MAXINT is defined in both <values.h> and <sys/param.h>
- */
-#undef MAXINT
-#endif
 #if defined(CSRG_BASED)
 #define MAXSHORT SHRT_MAX
 #else

cde/lib/DtTerm/TermPrim/TermPrim.c

@@ -75,7 +75,7 @@ extern char * _DtTermPrimGetMessage( char *filename, int set, int n, char *s );
 #include <ctype.h>
 #include <Dt/MsgCatP.h>
 #include <wchar.h>
-#if defined(__linux__) || defined(hpV4)
+#if defined(__linux__)
 # include <sys/types.h> /* For FD_* macros. */
 # include <sys/time.h> /* For select() prototype. */
 #else
@@ -246,21 +246,12 @@ static XtResource resources[] =
 	XtOffsetOf(struct _DtTermPrimitiveRec, term.columns),
 	XmRImmediate, (XtPointer) defaultColumns
     },
-#ifdef	HPVUE
-    {
-	DtNbackgroundIsSelect, DtCBackgroundIsSelect, XmRBoolean,
-	sizeof(Boolean),
-	XtOffsetOf(struct _DtTermPrimitiveRec, term.backgroundIsSelect),
-	XtRImmediate, (XtPointer) True
-    },
-#else	/* HPVUE */
     {
 	DtNbackgroundIsSelect, DtCBackgroundIsSelect, XmRBoolean,
 	sizeof(Boolean),
 	XtOffsetOf(struct _DtTermPrimitiveRec, term.backgroundIsSelect),
 	XtRImmediate, (XtPointer) False
     },
-#endif	/* HPVUE */
     {
 	XmNtraversalOn, XmCTraversalOn, XmRBoolean, sizeof(Boolean),
 	XtOffsetOf(struct _DtTermPrimitiveRec, primitive.traversal_on),

cde/lib/DtTerm/TermPrim/TermPrimGetPty-bsd.c

@@ -172,7 +172,7 @@ static struct _pty_dirs {
     {PTY_null,    PTY_null,     PTY_null,   PTY_null,   PTY_null, False},
 };
 
-#if defined(ALPHA_ARCHITECTURE) || defined(CSRG_BASED)
+#if defined(CSRG_BASED)
 /* Use openpty() to open Master/Slave pseudo-terminal pair */
 /* Current version of openpty() uses non-STREAM device. BSD name space */
 #define TTYNAMELEN      25
@@ -273,25 +273,8 @@ GetPty(char **ptySlave, char **ptyMaster)
 			     * This allows us to access the pty when we
 			     * are no longer suid root...
 			     */
-#ifdef	HP_ARCHITECTURE
-			    {
-				struct group *grp;
-				gid_t gid;
-				_Xgetgrparams grp_buf;
-
-				if (grp = _XGetgrnam("tty", grp_buf)) {
-				    gid = grp->gr_gid;
-				} else {
-				    gid = 0;
-				}
-				(void) endgrent();
-				(void) chown(ttyDev, getuid(), gid);
-				(void) chmod(ttyDev, 0620);
-			    }
-#else	/* HP_ARCHITECTURE */
 			    (void) chown(ttyDev, getuid(), getgid());
 			    (void) chmod(ttyDev, 0622);
-#endif	/* HP_ARCHITECTURE */
 
 			    /* close off the pty slave... */
 			    (void) close(ttyFd);
@@ -336,7 +319,7 @@ GetPty(char **ptySlave, char **ptyMaster)
 
     return(-1);
 }
-#endif /* ALPHA_ARCHITECTURE */
+#endif /* BSD */
 
 /* this is a public wrapper around the previous function that runs the
  * previous function setuid root...
@@ -358,45 +341,8 @@ _DtTermPrimGetPty(char **ptySlave, char **ptyMaster)
 static int
 SetupPty(char *ptySlave, int ptyFd)
 {
-#ifdef	HP_ARCHITECTURE
-    {
-	struct group *grp;
-	gid_t gid;
-	_Xgetgrparams grp_buf;
-
-	if (grp = _XGetgrnam("tty", grp_buf)) {
-	    gid = grp->gr_gid;
-	} else {
-	    gid = 0;
-	}
-	(void) endgrent();
-	(void) chown(ptySlave, getuid(), gid);
-	(void) chmod(ptySlave, 0620);
-    }
-#else	/* HP_ARCHITECTURE */
-#ifdef ALPHA_ARCHITECTURE
-    /* code from xterm to setup ownership and permission */
-    {
-        struct group *ttygrp;
-	_Xgetgrparams grp_buf;
-
-        if (ttygrp = _XGetgrnam("tty", grp_buf)) {
-           /* change ownership of tty to real uid, "tty" gid */
-           chown (ptySlave, getuid(), ttygrp->gr_gid);
-           chmod (ptySlave, 0620);
-        }
-        else {
-           /* change ownership of tty to real group and user id */
-           chown (ptySlave, getuid(), getgid());
-           chmod (ptySlave, 0622);
-        }
-        endgrent();
-    }
-#else	/* ALPHA_ARCHITECTURE */
     (void) chown(ptySlave, getuid(), getgid());
     (void) chmod(ptySlave, 0622);
-#endif /* ALPHA_ARCHITECTURE */
-#endif	/* HP_ARCHITECTURE */
     return 0;
 }
     

cde/lib/DtTerm/TermPrim/TermPrimGetPty-clone.c

@@ -34,9 +34,6 @@
 #include <errno.h>
 #include <signal.h>
 #include <Xm/Xm.h>
-#ifdef	HP_ARCHITECTURE
-# define X_INCLUDE_GRP_H
-#endif	/* HP_ARCHITECTURE */
 #define X_INCLUDE_UNISTD_H
 #define XOS_USE_XT_LOCKING
 #include <X11/Xos_r.h>
@@ -85,25 +82,8 @@ GetPty(char **ptySlave, char **ptyMaster)
 		(void) close(ttyFd);
 
 		/* fix the owner, mode, and group... */
-#ifdef	HP_ARCHITECTURE
-		{
-		    struct group *grp;
-		    gid_t gid;
-		    _Xgetgrparams grp_buf;
-
-		    if (grp = _XGetgrnam("tty", grp_buf)) {
-			gid = grp->gr_gid;
-		    } else {
-			gid = 0;
-		    }
-		    (void) endgrent();
-		    (void) chown(*ptySlave, getuid(), gid);
-		    (void) chmod(*ptySlave, 0620);
-		}
-#else	/* HP_ARCHITECTURE */
 		(void) chown(*ptySlave, getuid(), getgid());
 		(void) chmod(*ptySlave, 0622);
-#endif	/* HP_ARCHITECTURE */
 
 		/* pty master and slave names are already set.  Return
 		 * the file descriptor...
@@ -142,25 +122,8 @@ _DtTermPrimGetPty(char **ptySlave, char **ptyMaster)
 static int
 SetupPty(char *ptySlave, int ptyFd)
 {
-#ifdef	HP_ARCHITECTURE
-    {
-	struct group *grp;
-	gid_t gid;
-	_Xgetgrparams grp_buf;
-
-	if (grp = _XGetgrnam("tty", grp_buf)) {
-	    gid = grp->gr_gid;
-	} else {
-	    gid = 0;
-	}
-	(void) endgrent();
-	(void) chown(ptySlave, getuid(), gid);
-	(void) chmod(ptySlave, 0620);
-    }
-#else	/* HP_ARCHITECTURE */
     (void) chown(ptySlave, getuid(), getgid());
     (void) chmod(ptySlave, 0622);
-#endif	/* HP_ARCHITECTURE */
 }
     
 int

cde/lib/DtTerm/TermPrim/TermPrimOSDepI.h

@@ -63,32 +63,6 @@
 #ifndef	_Dt_TermPrimOSDepI_h
 #define	_Dt_TermPrimOSDepI_h
 
-#ifdef  ALPHA_ARCHITECTURE
-# define USE_TIOCCONS            /* use tioccons for -C          */
-# define HAS_SETEUID             /* seteuid available            */
-# define HAS_SETREUID            /* setreuid available           */
-# define USE_PTYS                /* use ptys                     */
-# define USE_TCSBRK              /* use TCSBRK ioctl()           */
-#endif /* ALPHA_ARCHITECTURE */
-
-#ifdef	HP_ARCHITECTURE
-# define XOR_CAPS_LOCK		/* xor caps lock and shift	*/
-# define USE_TIOCCONS		/* use tioccons for -C		*/
-# define SETENV_LINES_AND_COLS	/* set $LINES and $COLUMNS	*/
-# define HAS_SETRESUID		/* setresuid available		*/
-
-# if OSMAJORVERSION > 9
-#  define USE_STREAMS		/* use streams			    */
-#  define USE_CSWIDTH		/* use the csWidth resource to      */
-			        /* initialize multi-byte processing */
-				/* in ldterm                        */
-#  define USE_TCSENDBREAK	/* use tiocbreak()		*/
-# else	/* OSMAJORVERSION > 9 */
-#  define USE_PTYS		/* use ptys			*/
-#  define USE_TIOCBREAK		/* use TIOCBREAK ioctl()	*/
-# endif	/* OSMAJORVERSION > 9 */
-#endif /* HP_ARCHITECTURE */
-
 #ifdef  LINUX_ARCHITECTURE
 # define USE_TIOCCONS            /* use tioccons for -C          */
 # define HAS_SETEUID             /* seteuid available            */

cde/lib/DtTerm/TermPrim/TermPrimParser.c

@@ -37,12 +37,6 @@
 #include "TermPrimParserP.h"
 #include "TermPrimBuffer.h"
 
-#if defined (__hpux)
-/*
- * On HP MAXINT is defined in both <values.h> and <sys/param.h>
- */
-#undef MAXINT
-#endif
 #if defined(CSRG_BASED)
 #define MAXINT INT_MAX
 #else

cde/lib/DtTerm/TermPrim/TermPrimSetPty.c

@@ -36,19 +36,7 @@
 #include "TermPrimDebug.h"
 
 #include <fcntl.h>
-#ifdef  ALPHA_ARCHITECTURE
-#include <sys/ioctl.h>
-#include <sys/ttydev.h>
-#endif /* ALPHA_ARCHITECTURE */
 #include <termios.h>
-#ifdef	USE_PTYS
-#ifdef	HP_ARCHITECTURE
-#include <sys/ptyio.h>
-#endif	/* HP_ARCHITECTURE */
-#endif	/* USE_PTYS */
-#if	defined(HP_ARCHITECTURE) && !(OSMAJORVERSION > 9)
-#include <bsdtty.h>
-#endif	/* defined(HP_ARCHITECTURE) && !(OSMAJORVERSION > 9) */
 
 #if defined (USE_SETCSMAP)
 #include <langinfo.h>
@@ -571,40 +559,7 @@ _DtTermPrimPtyInit
             TMODE (XTTYMODE_eof,   tio.c_cc[VEOF]);
             TMODE (XTTYMODE_eol,   tio.c_cc[VEOL]);
 
-#if	defined(HP_ARCHITECTURE)
-            TMODE (XTTYMODE_swtch, tio.c_cc[VSWTCH]);
-            TMODE (XTTYMODE_susp,  tio.c_cc[VSUSP]);
-#if	OSMAJORVERSION > 9
-	    /* HP-UX 10.0 supports the new, extended c_cc[] array...
-	     */
-            TMODE (XTTYMODE_start, tio.c_cc[VSTART]);
-            TMODE (XTTYMODE_stop,  tio.c_cc[VSTOP]);
-            TMODE (XTTYMODE_dsusp, tio.c_cc[VDSUSP]);
-#ifdef	NOTDEF
-	    /* the following two parameters are not supported by
-	     * HP-UX 10.0.
-	     */
-            TMODE (XTTYMODE_rprnt, tio.c_cc[VREPRINT]);
-            TMODE (XTTYMODE_flush, tio.c_cc[VDISCARD]);
-#endif	/* NOTDEF */
-            TMODE (XTTYMODE_weras, tio.c_cc[VWERASE]);
-            TMODE (XTTYMODE_lnext, tio.c_cc[VLNEXT]);
-#else	/* OSMAJORVERSION > 9 */
-	    {
-		/* With HP-UX 9.0 (and earlier) we need to set dsuspc
-		 * via the ltchars array.  In addition, we have no support
-		 * for rprnt, flush, weras, and lnext...
-		 */
-		struct ltchars ltc;
-
-		if (!ioctl(pty, TIOCGLTC, &ltc)) {
-		    TMODE (XTTYMODE_dsusp, ltc.t_dsuspc);
-		    (void) ioctl(pty, TIOCSLTC, &ltc);
-		}
-	    }
-#endif	/* OSMAJORVERSION > 9 */
-
-#elif	defined(IBM_ARCHITECTURE)
+#if	defined(IBM_ARCHITECTURE)
             TMODE (XTTYMODE_start, tio.c_cc[VSTRT]);
             TMODE (XTTYMODE_stop,  tio.c_cc[VSTOP]);
             TMODE (XTTYMODE_susp,  tio.c_cc[VSUSP]);
@@ -625,15 +580,6 @@ _DtTermPrimPtyInit
             TMODE (XTTYMODE_weras, tio.c_cc[VWERASE]);
             TMODE (XTTYMODE_lnext, tio.c_cc[VLNEXT]);
 
-#elif   defined(ALPHA_ARCHITECTURE)
-	    TMODE (XTTYMODE_start, tio.c_cc[VSTART]);
-	    TMODE (XTTYMODE_stop,  tio.c_cc[VSTOP]);
-	    TMODE (XTTYMODE_susp,  tio.c_cc[VSUSP]);
-	    TMODE (XTTYMODE_dsusp, tio.c_cc[VDSUSP]);
-	    TMODE (XTTYMODE_rprnt, tio.c_cc[VREPRINT]);
-	    TMODE (XTTYMODE_flush, tio.c_cc[VDISCARD]);
-	    TMODE (XTTYMODE_weras, tio.c_cc[VWERASE]);
-	    TMODE (XTTYMODE_lnext, tio.c_cc[VLNEXT]);
 #endif
         }
 #undef TMODE

cde/lib/DtTerm/TermPrim/TermPrimSetUtmp.c

@@ -69,11 +69,6 @@
 #define	UT_NO_pututline
 #endif	/* sun */
 
-#ifdef	__hpux
-#define	UT_HOST		ut_host
-#define UT_ADDR		ut_addr
-#endif	/* __hpux */
-
 #ifdef	__AIX
 #define	UT_HOST		ut_host
 #define	UT_NO_pututline
@@ -362,24 +357,10 @@ UtmpEntryCreate(Widget w, pid_t pid, char *utmpLine)
     if (NULL == (utPtr = getutline(&ut))) {
 	/* build a base utmp entry... */
 	utPtr = &ut;
-#ifdef	__hpux
-	if (c = strstr(utmpLine, "tty")) {
-	    c += strlen("tty");
-	} else if (c = strstr(utmpLine, "pts")) {
-	    c += strlen("pts");
-	} else {
-	    c = utmpLine;
-	    if (strlen(utmpLine) > sizeof(utPtr->ut_id)) {
-		c += strlen(utmpLine) - sizeof(utPtr->ut_id);
-	    }
-	}
-	(void) strncpy(utPtr->ut_id, c, sizeof(utPtr->ut_id));
-#else	/* __hpux */
 #if defined(__AIX)
 	(void) strncpy(utPtr->ut_id, utmpLine,
 		sizeof(utPtr->ut_id));
-#else	/* __AIX */
-#if defined(__linux__) || defined(sun)
+#elif defined(__linux__) || defined(sun)
 	if (c = strchr(utmpLine, '/')) {
 	    c++;
 	} else {
@@ -389,8 +370,6 @@ UtmpEntryCreate(Widget w, pid_t pid, char *utmpLine)
 #else	/* linux || sun */
 	error out -- missing code for utPtr->ut_id
 #endif	/* sun */
-#endif	/* __AIX */
-#endif	/* __hpux */
     }
 
     /* set up the new entry... */

cde/lib/DtTerm/TermPrim/TermPrimSubproc.c

@@ -32,10 +32,10 @@
 
 #include "TermHeader.h"
 #include <fcntl.h>
-#if defined(ALPHA_ARCHITECTURE) || defined(CSRG_BASED) || defined(LINUX_ARCHITECTURE)
+#if defined(CSRG_BASED) || defined(LINUX_ARCHITECTURE)
 /* For TIOCSTTY definitions */
 #include <sys/ioctl.h>
-#endif /* ALPHA_ARCHITECTURE */
+#endif /* BSD || Linux */
 #include <sys/wait.h>
 
 #include <signal.h>
@@ -301,11 +301,6 @@ _DtTermPrimSubprocExec(Widget		  w,
     _Xgetpwparams pw_buf;
     _Xgetloginparams login_buf;
 
-#ifdef  ALPHA_ARCHITECTURE
-    /* merge code from xterm, ignore so that TIOCSWINSZ doesn't block */
-    signal(SIGTTOU, SIG_IGN);
-#endif /* ALPHA_ARCHITECTURE */
-
     /* build a default exec command and argv list if one wasn't supplied...
      */
     /* cmd... */
@@ -456,13 +451,13 @@ _DtTermPrimSubprocExec(Widget		  w,
 	/* child...
 	 */
         _DtTermProcessUnlock();
-#if defined(ALPHA_ARCHITECTURE) || defined(CSRG_BASED) || defined(LINUX_ARCHITECTURE)
+#if defined(CSRG_BASED) || defined(LINUX_ARCHITECTURE)
         /* establish a new session for child */
         setsid();
 #else
 	/* do a setpgrp() so that we can... */
 	(void) setpgrp();
-#endif /* ALPHA_ARCHITECTURE */
+#endif /* Linux || BSD */
 
 #if defined(LINUX_ARCHITECTURE)
 	/* set the ownership and mode of the pty... */
@@ -477,7 +472,7 @@ _DtTermPrimSubprocExec(Widget		  w,
 	    (void) _exit(1);
 	}
 
-#if defined(ALPHA_ARCHITECTURE) || defined(CSRG_BASED) || defined(LINUX_ARCHITECTURE)
+#if defined(CSRG_BASED) || defined(LINUX_ARCHITECTURE)
         /* BSD needs to do this to acquire pty as controlling terminal */
         if (ioctl(pty, TIOCSCTTY, (char *)NULL) < 0) {
 	    (void) close(pty);
@@ -488,7 +483,7 @@ _DtTermPrimSubprocExec(Widget		  w,
 
         /* Do it when no controlling terminal doesn't work for OSF/1 */
         _DtTermPrimPtyGetDefaultModes();
-#endif /* ALPHA_ARCHITECTURE */
+#endif /* Linux || BSD */
 
 #if !defined(LINUX_ARCHITECTURE)
 	/* set the ownership and mode of the pty... */

cde/lib/DtWidget/Editor.c

@@ -57,9 +57,7 @@
 #include <ctype.h>
 #include <stdlib.h>
 
-#if defined(__hpux)
-# include <wchar.h>
-#elif defined(sun)
+#if defined(sun)
 # if (_XOPEN_VERSION==3)
 #  include <wctype.h>
 # else

cde/lib/csa/agent.wrapbegin

@@ -1,6 +1,2 @@
 #ifndef _AGENTX_H
 #define _AGENTX_H
-
-#if defined(HPUX)
-#include <rpc/types.h>
-#endif /* HPUX */

cde/lib/csa/agent.wrapend

@@ -1,5 +1 @@
-#ifdef HPUX
-#undef hpux
-#define hpux
-#endif
 #endif

cde/lib/csa/cm.h

@@ -33,7 +33,7 @@
 
 #ifndef SunOS
 #include <rpc/types.h>
-#endif /* HPUX */
+#endif /* Sun */
 
 #include <rpc/rpc.h>
 
@@ -703,9 +703,4 @@ extern bool_t xdr_cms_delete_args();
 }
 #endif
 
-#ifdef HPUX
-#undef hpux
-#define hpux
 #endif
-#endif
-

cde/lib/csa/cmcb.h

@@ -151,9 +151,4 @@ extern bool_t xdr_cmcb_update_callback_args();
 }
 #endif
 
-#ifdef HPUX
-#undef hpux
-#define hpux
 #endif
-#endif
-

cde/lib/csa/connection.c

@@ -39,9 +39,6 @@
 #include <time.h>
 #include <unistd.h>
 #include <fcntl.h>
-#ifdef HPUX
-#include <sys/resource.h>
-#endif
 #include "connection.h"
 #include "rtable2.h"
 #include "rtable3.h"
@@ -53,11 +50,7 @@
 #include "convert3-4.h"
 #include "rpccalls.h"
 
-#ifdef HPUX
-#define MAX_COUNT	10
-#else
 #define MAX_COUNT	40
-#endif
 
 static struct timeval timeout_tv;
 static struct timeval retry_tv;
@@ -636,17 +629,12 @@ cleanup_some_connection(_DtCm_Client_Info *dontclose)
 	for (ci = client_cache_head; ci != NULL; )
 	{
 		total++;
-#ifdef HPUX
-		/* clean up whole list */
-		if (ci != dontclose && ci->nregistered == 0) {
-#else
 
 		if (ci != dontclose && ci->nregistered == 0 &&
 		    (ci->tcpcl || (!done && ci->tcpcl == NULL) ||
 		     (ci->tcpcl==NULL && (time(NULL) - ci->last_used)>DAYSEC)))
 		{
 			if (!done) done = 1;
-#endif
 
 			deleted++;
 			oldci = ci;
@@ -829,31 +817,13 @@ get_client_handle(
 	struct timeval tv;
 	enum clnt_stat status;
 
-#ifdef HPUX
-	static int bumped = 0;
-	struct rlimit rl;
-
-	if (bumped == 0) {
-		bumped = 1;
-
-		/* raise the soft limit of number of file descriptor */
-		getrlimit(RLIMIT_NOFILE, &rl);
-		rl.rlim_cur = rl.rlim_max;
-		setrlimit(RLIMIT_NOFILE, &rl);
-	}
-#endif
-
 	tv.tv_sec = 1;
 	tv.tv_usec = 0;
 
 	*clnt = NULL;
 	for (vers = vers_high; vers >= vers_low; vers--) {
-#if defined(__hpux)
-	        if ((cl = clnt_create((char *)host, prognum, vers, nettype)) != NULL) {
-#else
 
 		if ((cl = clnt_create(host, prognum, vers, nettype)) != NULL) {
-#endif
 			clnt_control(cl, CLSET_TIMEOUT, (char *)&tv);
 			status = clnt_call(cl, 0, (xdrproc_t) xdr_void, 
 					   (char *)NULL, (xdrproc_t) xdr_void,

cde/lib/csa/libcsa.elist

@@ -536,10 +536,6 @@ internal _DtCm_yylval
 internal _DtCm_yynerrs
 internal _DtCm_yytext
 
-#if defined(__hpux)
-internal _DtCm_yymaxdepth
-#endif
-
 #if defined(sun)
 internal _DtCm_yy__DtCm_yys
 internal _DtCm_yy__DtCm_yyv

cde/lib/csa/rtable2.h

@@ -47,7 +47,7 @@
 
 #ifndef SunOS
 #include <rpc/types.h>
-#endif /* HPUX */
+#endif /* Sun */
 
 
 #include <rpc/rpc.h>
@@ -465,9 +465,4 @@ extern bool_t _DtCm_xdr_Registration_Status_2();
 }
 #endif
 
-#ifdef HPUX
-#undef hpux
-#define hpux
 #endif
-#endif
-

cde/lib/csa/rtable3.h

@@ -46,7 +46,7 @@
 
 #ifndef SunOS
 #include <rpc/types.h>
-#endif /* HPUX */
+#endif /* Sun */
 
 
 #include <rpc/rpc.h>
@@ -533,9 +533,4 @@ extern bool_t _DtCm_xdr_Registration_Status_3();
 }
 #endif
 
-#ifdef HPUX
-#undef hpux
-#define hpux
 #endif
-#endif
-

cde/lib/csa/rtable4.h

@@ -597,9 +597,4 @@ extern bool_t _DtCm_xdr_Registration_Status_4();
 }
 #endif
 
-#ifdef HPUX
-#undef hpux
-#define hpux
 #endif
-#endif
-

cde/lib/pam/libpam/pam_framework.c

@@ -35,12 +35,6 @@
 #include <dlfcn.h>
 #endif
 
-#ifdef   hpV4
-#include <dl.h>
-#endif
-
-
-
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <string.h>
@@ -77,10 +71,6 @@ static int		load_modules(pam_handle_t *, int, char *);
 static void 		*open_module(char *);
 static int		load_function(void *, char *, int (**func)());
 #endif
-#ifdef hpV4
-static shl_t		open_module(char *);
-static int		load_function(shl_t, char *, int (**func)());
-#endif
 
 /* functions to read and store the pam.conf configuration file */
 static int		open_pam_conf(struct pam_fh **);
@@ -1040,10 +1030,6 @@ load_modules(pam_handle_t *pamh, int type, char *function_name)
 	void *mh;
 #endif
 
-#ifdef hpV4
-	shl_t mh;
-#endif
-
 	pamtab *pam_entry;
 	struct auth_module *authp;
 	struct account_module *accountp;
@@ -1233,20 +1219,12 @@ load_modules(pam_handle_t *pamh, int type, char *function_name)
 static void *
 open_module(char *module_so)
 {
-#endif
-#ifdef hpV4
-static shl_t
-open_module(char *module_so)
-{
 #endif
 	struct stat	stb;
 	char		*errmsg;
 #ifdef sun
 	void		*lfd;
 #endif /* sun */
-#ifdef hpV4
-	shl_t		lfd;
-#endif /* hpV4 */
 
 	/*
 	 * Stat the file so we can check modes and ownerships
@@ -1289,10 +1267,6 @@ open_module(char *module_so)
 	lfd = (void *) dlopen(module_so, RTLD_LAZY);
 #endif /* sun */
 
-#ifdef hpV4
-	lfd = shl_load(module_so, BIND_DEFERRED, 0L);
-#endif /* hpV4 */
-
 	if (lfd == NULL) {
 		if (pam_debug) {
 			errmsg = (char *) strerror(errno);
@@ -1313,20 +1287,9 @@ open_module(char *module_so)
 static int
 load_function(void *lfd, char *name, int (**func)())
 {
-#endif
-#ifdef hpV4
-static int
-load_function(shl_t lfd, char *name, int (**func)())
-{
 #endif
 	char *errmsg = NULL;
 
-#ifdef hpV4
-void *proc_addr = NULL;
-int stat;
-
-#endif
-
 	if (lfd == NULL)
 		return (PAM_SYMBOL_ERR);
 
@@ -1347,21 +1310,6 @@ int stat;
 	}
 #endif
 
-#ifdef hpV4
-
-	stat = shl_findsym(&lfd, name, TYPE_PROCEDURE, proc_addr);
-
-	*func = (int (*)())proc_addr;
-
-	if (stat) {
-		if (pam_debug) {
-			strerror_r(errno, errmsg, MAX_ERRMESSAGE_LENGTH);
-			syslog(LOG_DEBUG, "shl_findsym failed %s: error %s",
-				name, errmsg != NULL ? errmsg : "");
-		}
-		return (PAM_SYMBOL_ERR);
-	}
-#endif
 	if (pam_debug) {
 		syslog(LOG_DEBUG,
 			"load_function: successful load of %s", name);

cde/lib/tt/bin/tt_type_comp/frozen.mp_types_gram.C

@@ -84,12 +84,6 @@ typedef union
 
 #include <memory.h>
 
-#if defined (__hpux)
-/*
- * On HP MAXINT is defined in both <values.h> and <sys/param.h>
- */
-#undef MAXINT
-#endif
 #if defined(CSRG_BASED)
 #define MAXINT INT_MAX
 #else

cde/lib/tt/bin/ttdbserverd/db_server_svc.C

@@ -214,15 +214,11 @@ main(int argc, char** argv, char **envp)
 	void install_signal_handler();
 	SVCXPRT *transp;
 	struct sockaddr_in saddr;
-#if defined(HPUX)
-	int asize = sizeof(saddr);
-#else
 # if defined(__linux__) || defined(CSRG_BASED) || defined(sun)
 	socklen_t asize = sizeof(saddr);
 # else
 	size_t asize = sizeof(saddr);
 # endif
-#endif
 	int is_aix = 0;
 
 	int do_garbage_collect = 0;

cde/lib/tt/lib/db/tt_db_file.h

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

cde/lib/tt/lib/libtt.elist

@@ -32,26 +32,16 @@
 # define size_t		unsigned long
 # define pid_t		int
 # define uid_t		unsigned long
-#elif defined(hpV4)
-# define size_t		unsigned int
-# define pid_t		int
-# define uid_t		int
 #else
 # define size_t		unsigned int
 # define pid_t		long
 # define uid_t		long
 #endif
 
-#if defined(hpV4)
-# define xdrproc_t	int (*)(...)
-#else
 # define xdrproc_t	int (*)(void)
-#endif
 
 #if defined(_AIX)
 # define va_list	char*
-#elif defined(hpV4)
-# define va_list	double*
 #else
 # define va_list	void*
 #endif
@@ -830,36 +820,6 @@ privateC++ _Tt_message_list::__vtbl
 privateC++ _Tt_procid_list::__vtbl
 #endif
 
-#ifdef hpV4
-/* If debugging is enabled the tt clients require these symbols on HP. */
-privateC++ _Tt_arg::__vtbl
-privateC++ _Tt_context::__vtbl
-privateC++ _Tt_db_access::__vtbl
-privateC++ _Tt_db_client::__vtbl
-privateC++ _Tt_db_hostname_redirection_map::__vtbl
-privateC++ _Tt_db_key::__vtbl
-privateC++ _Tt_db_object::__vtbl
-privateC++ _Tt_db_property::__vtbl
-privateC++ _Tt_desktop_lock::__vtbl
-privateC++ _Tt_file_system_entry::__vtbl
-privateC++ _Tt_global::__vtbl
-privateC++ _Tt_int_rec::__vtbl
-privateC++ _Tt_message::__vtbl
-privateC++ _Tt_mp::__vtbl
-privateC++ _Tt_msg_context::__vtbl
-privateC++ _Tt_object_list::__vtbl
-privateC++ _Tt_object_table::__vtbl
-privateC++ _Tt_pat_context::__vtbl
-privateC++ _Tt_patlist::__vtbl
-privateC++ _Tt_pattern::__vtbl
-privateC++ _Tt_procid::__vtbl
-privateC++ _Tt_session::__vtbl
-privateC++ _Tt_session_prop::__vtbl
-privateC++ _Tt_string_buf::__vtbl
-privateC++ _Tt_string_buf_list::__vtbl
-privateC++ _Tt_string_list::__vtbl
-#endif
-
 #ifdef OPT_BUG_SUNOS_5
 /* This symbol was accidentally exported in libtt.so.1, so preserve */
 /* it for backward compatibility. */

cde/lib/tt/lib/mp/mp_session.C

@@ -149,7 +149,7 @@ c_open_unix_socket(char *socket_name)
 	memset(&server_addr, 0, sizeof(server_addr));
 	server_addr.sun_family = AF_UNIX;
 	strcpy(server_addr.sun_path, socket_name);
-#if defined(_AIX) || defined(hpux)
+#if defined(_AIX)
         int servlen = strlen(server_addr.sun_path) + sizeof(server_addr.sun_fam\
 ily);
         if (connect(sock, (sockaddr *)&server_addr, servlen) < 0) {

cde/lib/tt/lib/realpath.c

@@ -57,7 +57,7 @@ char *finalpath;
    strcpy(curpath, pathname);
 
    if (*pathname != '/') {
-#if defined(__STDC__) && defined(hpux)
+#if defined(__STDC__)
       if (!getcwd(workpath)) {
 #else
       if (!getwd(workpath)) {	

cde/lib/tt/lib/tt_options.h

@@ -71,15 +71,9 @@
  * OPT_BUG_SUNOS_5 -- used to flag special hacks only needed because
  *   of bugs or quirks in SunOS 5.x.
  * 
- * OPT_BUG_HPUX -- used to flag special hacks only needed because
- *   of bugs or quirks in HP-UX.
- * 
  * OPT_BUG_RPCINTR -- used to flag that RPC_INTR is not defined
  *   in enum clnt_stat.
  * 
- * OPT_BUG_SGI -- used to flag special hacks only needed because of
- *   bugs or quirks in SGI IRIX.
- *
  * OPT_XDR_LONG_TYPE -- used for (64-bit) architectures where
  *   <rcp/xdr.h> defines x_putlong and x_getlong to not take "long*".
  *
@@ -337,58 +331,6 @@
 #  undef  OPT_GARBAGE_THREADS
 # endif
 
-#elif defined(sgi)
-/* these are probably way obsolete now that irix is svr4 based */
-# define OPT_UNIX_SOCKET_RPC 
-# undef  OPT_TLI 
-# undef  OPT_DLOPEN_X11 
-# undef  OPT_DLOPEN_CE 
-# undef  OPT_ADDMSG_DIRECT 
-# undef  OPT_SECURE_RPC 
-# undef  OPT_CLASSING_ENGINE 
-# define OPT_TAR_HAS_EXCLUDE_OPTION
-
-#elif defined(__hpux) || defined(hpux)
-
-# undef  OPT_UNIX_SOCKET_RPC 
-# undef  OPT_TLI 
-# undef  OPT_DLOPEN_X11 
-# undef  OPT_DLOPEN_CE 
-# undef  OPT_ADDMSG_DIRECT
-# define OPT_BUG_HPUX
-# 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
-# undef  OPT_SYSINFO
-# define OPT_HAS_REALPATH
-# define OPT_AUTOMOUNT_PATH_FIX
-/*
- * re-define these. HP-UX does not seem to want to wake up a swapped
- * process. The timeouts have to be increased so that HP-UX has time
- * to swap in ttsession (if it is out).
- */
-# undef  OPT_PING_TRIES
-# define OPT_PING_TRIES		10
-# undef  OPT_PING_SLEEP
-# define OPT_PING_SLEEP		2
-# if OSMAJORVERSION < 10
-#  define OPT_CPP_PATH		"/lib/cpp"
-# else
-#  define OPT_CPP_PATH		"/opt/langtools/lbin/cpp"
-# endif
-# define OPT_CPP_OPTIONS	""
-# undef  OPT_SVR4_GETMNTENT
-# undef  OPT_LOCKF_MNTENT
-# define OPT_LOCAL_MOUNT_TYPE	MNTTYPE_HFS
-# define OPT_DEFINE_SIG_PF
-# undef  OPT_TAR_HAS_EXCLUDE_OPTION
-# define OPT_BUG_RPCINTR
-
 #elif defined(__linux__)
 
 # undef  OPT_UNIX_SOCKET_RPC 

cde/lib/tt/lib/tttk/ttdesktop.C

@@ -1765,8 +1765,7 @@ _ttdt_posix_cb(
 		tt_message_arg_val_set( msg, 4, names.machine );
 		// The last 3 are from sysinfo which seems to be SVR4 only.
 		// For platforms without the sysinfo call, we just leave
-		// the values unset for now, except for the serial
-		// number which is available from utsname onHPUX.
+		// the values unset for now
 #if defined(OPT_SYSINFO)		
 		if (sysinfo( SI_ARCHITECTURE, buf, SYS_NMLN ) >= 0) {
 			tt_message_arg_val_set( msg, 5, buf );
@@ -1777,8 +1776,6 @@ _ttdt_posix_cb(
 		if (sysinfo( SI_HW_SERIAL, buf, SYS_NMLN ) >= 0) {
 			tt_message_arg_val_set( msg, 7, buf );
 		}
-#elif defined(__hpux) || defined(hpux)
-		tt_message_arg_val_set( msg, 7, names.idnumber);
 #endif
 		tt_message_reply( msg );
 		tttk_message_destroy( msg );

cde/lib/tt/lib/util/tt_object_list.h

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

cde/lib/tt/lib/util/tt_port.C

@@ -45,12 +45,6 @@
 #include <stdlib.h>
 #include <stdarg.h>
 #include <syslog.h>
-#if defined(OPT_BUG_HPUX) && !defined(hpV4)
-extern "C" {
-	int syslog(int priority, const char *message, ...);
-	int openlog(const char *ident, int logopt, int facility);
-}
-#endif
 #if defined(sun)
 #include <sys/utsname.h>
 #endif
@@ -200,15 +194,11 @@ _tt_gethostid(void)
 			sscanf(serial_num, "%12lx", &_hostid);
 		}
 	}
-#elif defined(hpux) || defined(_AIX)
+#elif defined(_AIX)
 	struct utsname uts_name;
 	
 	uname(&uts_name);
-#	if defined(_AIX)
-		_hostid = atol(uts_name.machine);
-#	else
-		_hostid = atol(uts_name.idnumber);
-#	endif
+	_hostid = atol(uts_name.machine);
 #else
 	_hostid = gethostid();
 #endif
@@ -365,7 +355,7 @@ _tt_vsyslog(
 		return;
 	}
 
-#if defined(OPT_BUG_AIX) || defined(OPT_BUG_HPUX)
+#if defined(OPT_BUG_AIX)
 	char buf[5000];
 	vsprintf( buf, _format, args );
 	syslog( priority, buf );

cde/lib/tt/lib/util/tt_string.h

@@ -44,11 +44,7 @@
 #endif
 #include <limits.h>
 
-#if defined(OPT_BUG_HPUX)
-extern "C" {
-#include <wchar.h>
-};
-#elif defined(OPT_BUG_SUNOS_5)
+#if defined(OPT_BUG_SUNOS_5)
 #include <widec.h>
 #include <wctype.h>
 #elif defined(OPT_BUG_AIX)

cde/lib/tt/lib/util/tt_string_match.C

@@ -42,12 +42,6 @@
 #include "util/tt_assert.h"
 #include <string.h>
 
-#if defined (__hpux)
-/*
- * On HP MAXINT is defined in both <values.h> and <sys/param.h>
- */
-#undef MAXINT
-#endif
 #if defined(CSRG_BASED)
 #define MAXINT INT_MAX
 #else

cde/lib/tt/lib/util/tt_tracefile_parse.C

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

cde/lib/tt/lib/util/tt_xdr_utils.C

@@ -113,7 +113,7 @@ _tt_xdr_sizeof(xdrproc_t f, void *data)
 _Tt_xdr_size_stream::
 _Tt_xdr_size_stream() {
 	memset (&ops, 0, sizeof ops);
-#if defined(OPT_BUG_SUNOS_4) || defined(OPT_BUG_HPUX)
+#if defined(OPT_BUG_SUNOS_4)
 	ops.x_putlong = (int (*)(...))tt_x_putlong;
 	ops.x_putbytes = (int (*)(...))tt_x_putbytes;
 	ops.x_inline = (long *(*)(...))tt_x_inline;

cde/lib/tt/slib/mp_s_session.C

@@ -115,7 +115,7 @@ s_open_unix_socket(char *socket_name)
 	server_addr.sun_family = AF_UNIX;
 	(void)unlink(socket_name);
 	strcpy(server_addr.sun_path, socket_name);
-#if defined(_AIX)  || defined(hpux)
+#if defined(_AIX)
         int servlen = strlen(server_addr.sun_path) + sizeof(server_addr.sun_fam\
 ily);
         if (bind(sock, (struct sockaddr *)&server_addr,servlen) < 0) {

cde/programs/dtaction/Main.c

@@ -403,10 +403,7 @@ SetGidUid ( unsigned short rgid, unsigned short ruid )
     if(-1 == setregid(rgid, rgid)) {
         fprintf(stderr, "SetGidUid: setregid failed on %d\n", rgid);
     }
-#elif defined(__hpux)
-    setresgid(rgid, rgid, rgid);
-#else
-    setregid(rgid, rgid, rgid);
+    setregid(rgid, rgid);
 #endif
 
 	/* fix process uid */
@@ -416,10 +413,7 @@ SetGidUid ( unsigned short rgid, unsigned short ruid )
     if(-1 == setreuid(ruid, ruid)) {
         fprintf(stderr, "SetGidUid: setreuid failed on %d\n", ruid);
     }
-#elif defined(__hpux)
-    setresuid(ruid, ruid, ruid);
-#else
-    setreuid(ruid, ruid, ruid);
+    setreuid(ruid, ruid);
 #endif
 
 }
@@ -591,13 +585,7 @@ AddSuLog(
     time_t    timenow;
     struct tm  *now;
 
-#ifdef hpV4  /* 10.* versions */
     char * SULog = "/var/adm/sulog";
-#elif  defined( hpux )	/* 9.* versions */
-    char * SULog = "/usr/adm/sulog";
-#else
-    char * SULog = "/var/adm/sulog";
-#endif
 
     if ((f = fopen (SULog, "a")) == NULL)
 	return;

cde/programs/dtaction/demo/Makefile.hp

@@ -1,52 +0,0 @@
-# $XConsortium: Makefile.hp /main/2 1996/05/13 11:29:32 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
-
-CFLAGS         = +Obb2000 -Aa
-OPTIMIZEDFLAGS = -O
-
-DEFINES        = -D_HPUX_SOURCE
-
-DTINCLUDE      = -I$(CDE_INSTALLATION_TOP)/include
-XMINCLUDE      = -I$(CDE_INSTALLATION_TOP)/include
-X11INCLUDE     = -I/usr/include/X11R5
-EXTRA_INCLUDES =
-INCLUDES       = $(DTINCLUDE) $(XMINCLUDE) $(X11INCLUDE) $(EXTRA_INCLUDES)
-
-DTSVCLIB       = -L$(CDE_INSTALLATION_TOP)/lib -lDtSvc
-TTLIB          = -L$(CDE_INSTALLATION_TOP)/lib -ltt
-XMLIB          = -L$(CDE_INSTALLATION_TOP)/lib -lXm
-XTLIB          = -L$(CDE_INSTALLATION_TOP)/lib -lXt
-X11LIB         = -L/usr/lib/X11R5 -lX11
-
-LIBRARIES      = $(DTSVCLIB) $(TTLIB) $(XMLIB) $(XTLIB) $(X11LIB)
-
-LDFLAGS        =
-
-.c.o:
-	cc -c $(CFLAGS) $(DEFINES) $(OPTIMIZEDFLAGS) $(INCLUDES) $<
-
-all::	$(PROGRAM)
-
-$(PROGRAM)::	$(OBJECTS)
-	cc -o $(PROGRAM) $(LDFLAGS) $(OBJECTS) $(LIBRARIES)
-
-clean::
-	rm -f $(PROGRAM)
-	rm -f $(OBJECTS)

cde/programs/dtappbuilder/src/ab/Makefile.am

@@ -29,7 +29,6 @@ endif
 
 AB_MAKEFILES = \
         Makefile.aix \
-        Makefile.hpux \
         Makefile.sunos \
         Makefile.linux \
         Makefile.freebsd \

cde/programs/dtappbuilder/src/abmf/make_file.c

@@ -99,7 +99,6 @@ static int write_os_params(
 			AbmfLibs	libs
 			);
 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_lnx_params(File makeFile, AbmfLibs libs);
 static int write_fbsd_params(File makeFile, AbmfLibs libs);
@@ -107,7 +106,6 @@ static int write_nbsd_params(File makeFile, AbmfLibs libs);
 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_lnx_libs(AbmfLibs libs, ABObj project);
 static int      determine_fbsd_libs(AbmfLibs libs, ABObj project);
@@ -196,11 +194,6 @@ determine_libs(AbmfLibs libs, ABObj project, AB_OS_TYPE osType)
 	lib_add(libs, LibICE, ABMF_LIB_APPEND, ABMF_LIB_REJECT_DUP);
 	lib_add(libs, LibSM, ABMF_LIB_APPEND, ABMF_LIB_REJECT_DUP);
 	lib_add(libs, LibXp, ABMF_LIB_APPEND, ABMF_LIB_REJECT_DUP);
-
-	if (osType == AB_OS_HPUX)
-	{
-	    lib_add(libs, LibTt, ABMF_LIB_APPEND, ABMF_LIB_REJECT_DUP);
-	}
     }
 
     if (projData->has_terminal)
@@ -217,10 +210,6 @@ determine_libs(AbmfLibs libs, ABObj project, AB_OS_TYPE osType)
 		return_value = determine_aix_libs(libs, project);
 		break;
 
-	case AB_OS_HPUX:
-		return_value = determine_hpux_libs(libs, project);
-		break;
-
 	case AB_OS_SUNOS:
 		return_value = determine_sunos_libs(libs, project);
 		break;
@@ -247,18 +236,6 @@ determine_aix_libs(AbmfLibs libs, ABObj project)
     return 0;
 }
 
-
-static int
-determine_hpux_libs(AbmfLibs libs, ABObj project)
-{
-    /*
-    lib_add(libs, LibWlarchive, ABMF_LIB_PREPEND, ABMF_LIB_REPLACE_DUP);
-    lib_add(libs, LibWldefault, ABMF_LIB_APPEND, ABMF_LIB_REPLACE_DUP);
-    */
-    return 0;
-}
-
-
 static int
 determine_sunos_libs(AbmfLibs libs, ABObj project)
 {
@@ -476,10 +453,6 @@ write_os_params(
 		return_value = write_aix_stuff(makeFile, libs);
 		break;
 
-	case AB_OS_HPUX:
-		return_value = write_hpux_stuff(makeFile, libs);
-		break;
-
 	case AB_OS_SUNOS:
 		return_value = write_sunos_params(makeFile, libs);
 		break;
@@ -551,52 +524,6 @@ write_aix_stuff(File makeFile, AbmfLibs libs)
 }
 
 
-static int
-write_hpux_stuff(File makeFile, AbmfLibs libs)
-{
-    STRING	osName = util_os_type_to_string(AB_OS_HPUX);
-
-    abio_printf(makeFile, 
-"###########################################################################\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 = -DSYSV -DNLS16 -DMALLOC_0_RETURNS_NULL -DMERGE -DNDEBUG"
-        " -D__hpux -Dhpux -DOSMAJORVERSION=9 -DOSMINORVERSION=0 -DSHMLINK"
-        " -D__hp9000s800 -Dhp9000s800 -Dhp9000s700 -DHPPEX\n"
-"        ANSI_DEFINES = -Aa -D_HPUX_SOURCE -DANSICPP\n"
-"\n"
-"        CDEBUGFLAGS = -g -z\n"
-"        COPTFLAGS = -O -z\n"
-"        SYS_LIBRARIES = -lm\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_HPUX);
-
-    abio_puts(makeFile,
-"\n"
-"        CFLAGS = $(CDEBUGFLAGS) $(INCLUDES) $(STD_DEFINES)"
-            " $(ANSI_DEFINES)\n"
-"        LDLIBS = $(SYS_LIBRARIES)\n"
-"        LDOPTIONS = $(CDE_LDFLAGS) $(ALLX_LDFLAGS)\n"
-"\n"
-);
-
-    return 0;
-}
-
-
 static int
 write_sunos_params(File makeFile, AbmfLibs libs)
 {
@@ -1159,7 +1086,7 @@ write_targets(
 "\n"
 "scour:\n"
 "	$(RM) $(CLEAN_FILES) $(TARGETS.h.merged) $(TARGETS.c.merged) \\\n"
-"	      Makefile Makefile.aix Makefile.hpux Makefile.sunos \\\n"
+"	      Makefile Makefile.aix Makefile.sunos \\\n"
 "	      Makefile.linux \\\n"
 "	      Makefile.freebsd Makefile.netbsd Makefile.openbsd\n"
 );

cde/programs/dtappbuilder/src/include/ab_private/util.h

@@ -78,7 +78,6 @@ extern char	*strdup(const char *);
 typedef enum
 {
     AB_OS_UNDEF = 0,
-    AB_OS_HPUX,
     AB_OS_AIX,
     AB_OS_SUNOS,
     AB_OS_LNX,

cde/programs/dtappbuilder/src/libABil/Makefile.am

@@ -8,10 +8,6 @@ BUILT_SOURCES = bil_parse.h bil_parse.c
 CLEANFILES = bil_parse.h bil_parse.c
 AM_YFLAGS = -d
 
-if HPUX
-CCOPTIONS = -Ae
-endif
-
 noinst_LIBRARIES = libABil.a
 
 #noinst_PROGRAMS = bil_test

cde/programs/dtappbuilder/src/libABobjXm/Makefile.am

@@ -4,10 +4,6 @@ ABINCLUDES = ../include
 
 EXTRA_DEFINES =  -D_POSIX_SOURCE=1
 
-if HPUX
-CCOPTIONS = -Ae
-endif
-
 noinst_LIBRARIES = libABobjXm.a
 
 libABobjXm_a_CFLAGS = $(EXTRA_DEFINES) -I$(ABINCLUDES)

cde/programs/dtappbuilder/src/libAButil/Makefile.am

@@ -4,10 +4,6 @@ ABINCLUDES = ../include
 
 EXTRA_DEFINES =  -D_POSIX_SOURCE=1
 
-if HPUX
-CCOPTIONS = -Ae
-endif
-
 noinst_LIBRARIES = libAButil.a
 
 #noinst_PROGRAMS = util_test istr_test