Remove UXPDS support

cde/programs/dtudcfonted/dtgpftobdf/bdftosnf.h

@@ -137,14 +137,6 @@ typedef struct _TempFont {
 #	  define DEFAULTSCANUNIT  1		/* default bitmap scan unit */
 #        endif
 
-#       else
-#	 ifdef __uxp__
-
-#	  define DEFAULTGLPAD 	  4		/* default padding for glyphs */
-#	  define DEFAULTBITORDER  MSBFirst	/* default bitmap bit order */
-#	  define DEFAULTBYTEORDER MSBFirst	/* default bitmap byte order */
-#	  define DEFAULTSCANUNIT  1		/* default bitmap scan unit */
-
 #	 else
 #	  define DEFAULTGLPAD     1		/* default padding for glyphs */
 #	  define DEFAULTBITORDER  MSBFirst	/* default bitmap bit order */
@@ -159,7 +151,6 @@ typedef struct _TempFont {
 #   endif
 #  endif
 # endif
-#endif
 
 #define GLWIDTHBYTESPADDED(bits,nbytes) \
 	((nbytes) == 1 ? (((bits)+7)>>3)	/* pad to 1 byte */ \

cde/programs/dtudcfonted/include/uxpfontstruct.h

@@ -1,66 +0,0 @@
-/*
- * CDE - Common Desktop Environment
- *
- * Copyright (c) 1993-2012, The Open Group. All rights reserved.
- *
- * These libraries and programs are free software; you can
- * redistribute them and/or modify them under the terms of the GNU
- * Lesser General Public License as published by the Free Software
- * Foundation; either version 2 of the License, or (at your option)
- * any later version.
- *
- * These libraries and programs are distributed in the hope that
- * they will be useful, but WITHOUT ANY WARRANTY; without even the
- * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- * PURPOSE. See the GNU Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with these librararies and programs; if not, write
- * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
- * Floor, Boston, MA 02110-1301 USA
- */
-/* $XConsortium: uxpfontstruct.h /main/1 1995/09/14 20:52:27 cde-fuj2 $ */
-/*
- *  All Rights Reserved, Copyright (c) FUJITSU LIMITED 1995
- *
- *  This is unpublished proprietary source code of FUJITSU LIMITED
- *
- *  Authors: Seiya Miyazaki     FUJITSU LIMITED
- *           Hiroyuki Chiba     FUJITSU LIMITED
- *
- */
-
-#ifndef FEFONTSTRUCT_H
-#define FEFONTSTRUCT_H 1
-
-/* 
- * for use in version
- */
-
-#define FE_PREFIXS	"FEF/"
-#define FE_PREFIXL	4
-
-
-/*
- * for use in permission.
- */
-
-#define FE_DISPLAY_FONT	0x01
-#define FE_PRINTER_FONT	0x02
-
-/*
- * uxp Extended Font Structure
- */
-
-typedef struct _FeFontInfo {
-    char		version[32];	/* version */
-    char		copyright[64];	/* Copyright */
-    unsigned int	permission;	/* purpose for use */ 
-    char		reserve[24];
-    int			privatesize;	/* size of private area */
-} FeFontInfoRec;
-
-typedef struct _FeFontInfo *FeFontInfoPtr;
-
-#endif /* FEFONTSTRUCT_H */

cde/programs/dtudcfonted/libfal/Imakefile

@@ -12,16 +12,10 @@ XCOMM $XConsortium: Imakefile /main/16 1996/09/09 11:45:13 drk $
           XLOCALEDIR  = $(XPROJECTROOT)/lib/X11/locale
           XFONTDIR    = $(XPROJECTROOT)/lib/X11/fonts
 
-#if defined (UXPArchitecture)
-UXPFONTDIR = /usr/lib/X11/fonts
-UDCFONTPATH = $(UXPFONTDIR)/uxp:$(UXPFONTDIR)/misc
-FALOPT1       = -DDTUDCFONTPATH='"'$(UDCFONTPATH)'"'
-#else
 UDCFONTPATH = $(XFONTDIR)/misc
 FALOPT1       = -DDTUDCFONTPATH='"'$(XFONTDIR)/misc'"'
-#endif	/* UXPArchitecture */
-        FALOPT2       = -DXLOCALEDIR='"'$(XLOCALEDIR)'"'
-        FALOPT3       = -DDTUDCFONTSLISTDIR='"'$(FALDESTDIR)/$(FONTLIST)'"'
+FALOPT2       = -DXLOCALEDIR='"'$(XLOCALEDIR)'"'
+FALOPT3       = -DDTUDCFONTSLISTDIR='"'$(FALDESTDIR)/$(FONTLIST)'"'
 
 #ifdef X11ProjectRoot
         OPT2 = -DFONTC='"'$(XPROJECTROOT)/bin/bdftopcf'"'

cde/programs/dtudcfonted/libfal/include/misc.h

@@ -68,11 +68,7 @@ extern unsigned long serverGeneration;
 #endif
 #endif
 
-#ifdef __uxp__
-#define MAXSCREENS	5
-#else /* !__uxp__ */
 #define MAXSCREENS	3
-#endif /* !__uxp__ */
 #define MAXCLIENTS	128
 #define MAXFORMATS	8
 #define MAXVISUALS_PER_SCREEN 50

cde/programs/dtudcfonted/libfal/include/os.h

@@ -65,7 +65,7 @@ This is unpublished proprietary source code of FUJITSU LIMITED
 #define SCREEN_SAVER_OFF  1
 #define SCREEN_SAVER_FORCER 2
 
-#if defined(stellar) || defined(__uxp__)
+#if defined(stellar)
 #define MAX_REQUEST_SIZE 65535
 #else
 #define MAX_REQUEST_SIZE 16384
@@ -97,13 +97,13 @@ pragma on(alloca);
 #endif /* defined(__HIGHC__) */
 
 
-#if defined(__GNUC__) || defined(__uxp__)
+#if defined(__GNUC__)
 #if !defined(linux)
 #define alloca ___builtin_alloca
 #endif
 #define ALLOCATE_LOCAL(size) alloca((int)(size))
 #define DEALLOCATE_LOCAL(ptr)  /* as nothing */
-#else /* ! __GNUC__ ! __uxp__ */
+#else /* ! __GNUC__ */
 /*
  * warning: mips alloca is unsuitable in the server, do not use.
  */

cde/programs/dtudcfonted/libfal/include/servermd.h

@@ -146,20 +146,6 @@ This is unpublished proprietary source code of FUJITSU LIMITED
 
 #endif /* vax */
 
-#ifdef __uxp__
-
-#define IMAGE_BYTE_ORDER       MSBFirst
-#define BITMAP_BIT_ORDER       MSBFirst
-
-#define AVOID_MEMORY_READ
-#define LARGE_INSTRUCTION_CACHE
-#define FAST_CONSTANT_OFFSET_MODE
-
-#define GLYPHPADBYTES		4   
-#define GETLEFTBITS_ALIGNMENT   1
-
-#endif /* __uxp__ */
-
 #ifdef sun
 
 #if defined(sun386) || defined(sun5)