From 01c9b8889bc036310cb24875bbda65067fc3f4e0 Mon Sep 17 00:00:00 2001 From: chase Date: Sun, 24 Jun 2018 07:22:21 -0500 Subject: [PATCH] Remove macII support --- cde/config/cf/Imake.cf | 9 +--- cde/config/cf/Imakefile | 1 - cde/config/cf/macII.cf | 53 ------------------- cde/config/imake/imake.c | 5 +- cde/config/imake/imakemdep.h | 7 --- cde/config/makedepend/def.h | 3 -- cde/config/util/makestrs.c | 3 -- .../dtudcfonted/dtgpftobdf/bdftosnf.h | 46 +++++----------- .../dtudcfonted/libfal/include/servermd.h | 11 ---- 9 files changed, 14 insertions(+), 124 deletions(-) delete mode 100644 cde/config/cf/macII.cf diff --git a/cde/config/cf/Imake.cf b/cde/config/cf/Imake.cf index 4b984aec..07712dcc 100644 --- a/cde/config/cf/Imake.cf +++ b/cde/config/cf/Imake.cf @@ -5,7 +5,7 @@ XCOMM $TOG: Imake.cf /main/30 1998/04/28 13:55:25 barstow $ * 1. Identify a machine-specific cpp symbol. If your preprocessor * does not have any built in, you will need to add the symbol to the * cpp_argv table in config/imake/imakemdep.h and rebuild imake with - * the BOOTSTRAPCFLAGS variable set (see the macII for an example). + * the BOOTSTRAPCFLAGS variable set. * * 2. Add all machine-specific cpp symbols (either defined by you or by * the preprocessor or compiler) to the predefs table in @@ -317,13 +317,6 @@ XCOMM $TOG: Imake.cf /main/30 1998/04/28 13:55:25 barstow $ # define M4330Architecture #endif /* M4330 */ -#ifdef macII -# define MacroIncludeFile -# define MacroFile macII.cf -# undef macII -# define MacIIArchitecture -#endif /* macII */ - #ifdef _CRAY # define MacroIncludeFile # define MacroFile cray.cf diff --git a/cde/config/cf/Imakefile b/cde/config/cf/Imakefile index 01cf9ab7..e1c5e3b6 100644 --- a/cde/config/cf/Imakefile +++ b/cde/config/cf/Imakefile @@ -72,7 +72,6 @@ ibm.cf \ isc.cf \ linux.cf \ luna.cf \ -macII.cf \ mach.cf \ minix.cf \ moto.cf \ diff --git a/cde/config/cf/macII.cf b/cde/config/cf/macII.cf deleted file mode 100644 index 90d1c86b..00000000 --- a/cde/config/cf/macII.cf +++ /dev/null @@ -1,53 +0,0 @@ -XCOMM platform: $XConsortium: macII.cf /main/50 1996/09/28 16:11:19 rws $ - -#ifndef OSName -#define OSName A/UX 3.0.1 -#endif -#ifndef OSMajorVersion -#define OSMajorVersion 3 -#endif -#ifndef OSMinorVersion -#define OSMinorVersion 0 -#endif -#ifndef OSTeenyVersion -#define OSTeenyVersion 1 -#endif -XCOMM operating system: OSName - -#if HasGcc -#define BootstrapCFlags -DmacII -#endif -#define SystemV YES -#define HasPoll NO -#define NeedBerklib YES -#define ExtraLibraries $(XBSDLIB) -lposix -lm -lmr -#define Malloc0ReturnsNull YES -#define StandardDefines -DmacII -DSYSV -#define ExecableScripts NO -#define RemoveTargetProgramByMoving YES -#define ExpandManNames YES -#define PexShmIPC NO -#define XmacIIServer YES -#define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC -#if MacHasc89 -#define CcCmd c89 -D_POSIX_SOURCE -#else -#define HasVoidSignalReturn NO -#endif -#if OSMajorVersion <= 2 -#define ServerExtraDefines -DSUPPORT_2_0 -#endif -#define InstKmemFlags -g sys -m 2711 -#define ExtensionOSDefines -DXTESTEXT1 - -#if !HasGcc -#define DefaultCCOptions -A 3 -#define PexCCOptions -A 4 -#endif - -/* - * If you wish to override the man page directories, do so here using just - * one tab between the parameter name (e.g. ManDirectoryRoot) and the - * value so that cpp doesn't get confused. - */ -#define ManDirectoryRoot /usr/catman/u_man diff --git a/cde/config/imake/imake.c b/cde/config/imake/imake.c index e0c5a673..3444c045 100644 --- a/cde/config/imake/imake.c +++ b/cde/config/imake/imake.c @@ -226,9 +226,6 @@ typedef union wait waitType; char *malloc(), *realloc(); void exit(); #endif -#if defined(macII) && !defined(__STDC__) /* stdlib.h fails to define these */ -char *malloc(), *realloc(); -#endif /* macII */ #ifdef X_NOT_STDC_ENV extern char *getenv(); #endif @@ -263,7 +260,7 @@ extern int errno; * This define of strerror is copied from (and should be identical to) * Xos.h, which we don't want to include here for bootstrapping reasons. */ -#if defined(X_NOT_STDC_ENV) || (defined(sun) && !defined(SVR4)) || defined(macII) +#if defined(X_NOT_STDC_ENV) || (defined(sun) && !defined(SVR4)) # ifndef strerror extern char *sys_errlist[]; extern int sys_nerr; diff --git a/cde/config/imake/imakemdep.h b/cde/config/imake/imakemdep.h index aa897b4a..8d5a3aca 100644 --- a/cde/config/imake/imakemdep.h +++ b/cde/config/imake/imakemdep.h @@ -65,10 +65,6 @@ in this Software without prior written authorization from The Open Group. #endif #endif -#if defined(macII) || defined(_AUX_SOURCE) -#define imake_ccflags "-DmacII -DSYSV" -#endif - #ifdef stellar #define imake_ccflags "-DSYSV" #endif @@ -354,9 +350,6 @@ char *cpp_argv[ARGUMENTS] = { #ifdef M4310 "-DM4310", /* Tektronix */ #endif -#if defined(macII) || defined(_AUX_SOURCE) - "-DmacII", /* Apple A/UX */ -#endif #ifdef sony "-Dsony", /* Sony */ #if !defined(SYSTYPE_SYSV) && !defined(_SYSTYPE_SYSV) && NEWSOS < 42 diff --git a/cde/config/makedepend/def.h b/cde/config/makedepend/def.h index ba172839..066cda33 100644 --- a/cde/config/makedepend/def.h +++ b/cde/config/makedepend/def.h @@ -140,9 +140,6 @@ struct filepointer { #ifndef X_NOT_STDC_ENV #include -#if defined(macII) && !defined(__STDC__) /* stdlib.h fails to define these */ -char *malloc(), *realloc(); -#endif /* macII */ #else char *malloc(); char *realloc(); diff --git a/cde/config/util/makestrs.c b/cde/config/util/makestrs.c index 8087b396..080c21ab 100644 --- a/cde/config/util/makestrs.c +++ b/cde/config/util/makestrs.c @@ -53,9 +53,6 @@ in this Software without prior written authorization from The Open Group. #else char *malloc(); #endif -#if defined(macII) && !defined(__STDC__) /* stdlib.h fails to define these */ -char *malloc(); -#endif /* macII */ typedef struct _TableEnt { struct _TableEnt* next; diff --git a/cde/programs/dtudcfonted/dtgpftobdf/bdftosnf.h b/cde/programs/dtudcfonted/dtgpftobdf/bdftosnf.h index 133df488..975c0fbc 100644 --- a/cde/programs/dtudcfonted/dtgpftobdf/bdftosnf.h +++ b/cde/programs/dtudcfonted/dtgpftobdf/bdftosnf.h @@ -61,13 +61,12 @@ typedef struct _TempFont { } TempFont; /* not called font since collides with type in X.h */ #ifdef vax - # define DEFAULTGLPAD 1 /* default padding for glyphs */ # define DEFAULTBITORDER LSBFirst /* default bitmap bit order */ # define DEFAULTBYTEORDER LSBFirst /* default bitmap byte order */ # define DEFAULTSCANUNIT 1 /* default bitmap scan unit */ -#else -# ifdef sun + +#elif defined(sun) # if (sun386 || sun5) # define DEFAULTGLPAD 4 /* default padding for glyphs */ @@ -81,76 +80,55 @@ typedef struct _TempFont { # define DEFAULTSCANUNIT 1 /* default bitmap scan unit */ # endif -# else -# ifdef apollo +#elif defined(apollo) # define DEFAULTGLPAD 2 /* 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 -# ifdef ibm032 +#elif defined(ibm032) # define DEFAULTGLPAD 1 /* 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 -# ifdef hpux +#elif defined(hpux) # define DEFAULTGLPAD 2 /* 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 -# ifdef pegasus +#elif defined(pegasus) # 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 -# ifdef macII - -# 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 -# ifdef mips -# ifdef MIPSEL +#elif defined(mips) +# ifdef MIPSEL # define DEFAULTGLPAD 4 /* default padding for glyphs */ # define DEFAULTBITORDER LSBFirst /* default bitmap bit order */ # define DEFAULTBYTEORDER LSBFirst /* default bitmap byte order */ # define DEFAULTSCANUNIT 1 /* default bitmap scan unit */ -# else +# else # 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 */ -# endif +# endif -# else +#else # define DEFAULTGLPAD 1 /* 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 */ - -# endif -# endif -# endif -# endif -# endif -# endif -# endif -# endif +#endif #define GLWIDTHBYTESPADDED(bits,nbytes) \ ((nbytes) == 1 ? (((bits)+7)>>3) /* pad to 1 byte */ \ diff --git a/cde/programs/dtudcfonted/libfal/include/servermd.h b/cde/programs/dtudcfonted/libfal/include/servermd.h index 9e79efae..a4f83da4 100644 --- a/cde/programs/dtudcfonted/libfal/include/servermd.h +++ b/cde/programs/dtudcfonted/libfal/include/servermd.h @@ -214,17 +214,6 @@ This is unpublished proprietary source code of FUJITSU LIMITED #endif /* tektronix */ -#ifdef macII - -#define IMAGE_BYTE_ORDER MSBFirst /* Values for the MacII only */ -#define BITMAP_BIT_ORDER MSBFirst -#define GLYPHPADBYTES 4 -#define GETLEFTBITS_ALIGNMENT 1 - -/* might want FAST_UNALIGNED_READS for frame buffers with < 1us latency */ - -#endif /* macII */ - #ifdef mips #ifdef MIPSEL -- 2.25.1