Merge pull request uniconproject#377 from Don-Ward/Remove-MACINTOSH

Remove MACINTOSH configuration.
ValG4 · Mar 8, 2024 · 365c53a · 365c53a
2 parents ad4ac7a + 512d7fe
commit 365c53a
Show file tree

Hide file tree

Showing 24 changed files with 44 additions and 182 deletions.
diff --git a/doc/book/langref.tex b/doc/book/langref.tex
@@ -4769,7 +4769,6 @@ \subsection*{Predefined symbols}
 
 \_V9\ \ \ \ \ \ \ \ \ \ Version 9\\
 \_CMS\ \ \ \ \ \ \ \ \ \ CMS\\
-\_MACINTOSH\ \ \ \ \ \ Macintosh\\
 \_MSDOS\_386\ \ \ \ \ \ MS-DOS/386\\
 \_MS\_WINDOWS\_NT\ \ \ \ MS Windows NT\\
 \_MSDOS\ \ \ \ \ \ \ \ MS-DOS\\

diff --git a/doc/ib/appH.tex b/doc/ib/appH.tex
@@ -273,7 +273,7 @@ \chapter{Glossary of Defined Symbols}
 M\_PI & IU & constant value of Pi \\
 MacGraph & U & build graphics using (legacy pre OSX) Mac graphics (should delete)  \\
 MACGRAPH\_H & IU & macgraph.h has been included \\
-MACINTOSH & all & build on legacy Mac platform (delete?)  \\
+{\gr MACINTOSH} & {\gr all} & {\gr build on legacy Mac platform (delete?)}  \\
 MacOS & U & build on modern UNIX-based Mac platform \\
 max & all & compute maximum of x and y \\
 MaxAbrSize & all & maximum allocated block region size \\

diff --git a/src/common/dconsole.c b/src/common/dconsole.c
@@ -1045,9 +1045,7 @@ int i;
       pollevent();
       }
 
-#if !MACINTOSH
-   #undef exit
-#endif					/* MACINTOSH */
+#undef exit
    exit(i);
 }
 

diff --git a/src/common/filepart.c b/src/common/filepart.c
@@ -30,11 +30,6 @@ static char *tryfile	(char *buf, char *dir, char *name, char *extn);
    #define FileSep '/'
 #endif					/* MSDOS */
 
-#if MACINTOSH
-   #define Prefix ":"
-   #define FileSep ':'
-#endif					/* MACINTOSH */
-
 #if MVS
    #define Prefix ""
    #define FileSep '('

diff --git a/src/h/config.h b/src/h/config.h
@@ -210,10 +210,6 @@
    #define PORT 0
 #endif					/* PORT */
 
-#ifndef MACINTOSH
-   #define MACINTOSH 0
-#endif					/* MACINTOSH */
-
 #ifndef MSDOS
    #define MSDOS 0
 #endif					/* MSDOS */
@@ -1026,3 +1022,7 @@ Deliberate Syntax Error
 #if defined(CRAY) || defined (CRAY_STACK)
 #error The CRAY configuration option is no longer supported (since 7 Mar 2024)
 #endif					/* CRAY */
+
+#if defined(MACINTOSH)
+#error The MACINTOSH configuration option is no longer supported (since 7 Mar 2024)
+#endif					/* MACINTOSH */
diff --git a/src/h/feature.h b/src/h/feature.h
@@ -22,10 +22,6 @@
    Feature(1, "_CMS", "CMS")
 #endif					/* VM */
 
-#if MACINTOSH
-   Feature(1, "_MACINTOSH", "Macintosh")
-#endif					/* MACINTOSH */
-
 #ifdef MacOS
    Feature(1, "_MACOS", "MacOS")
 #endif					/* MacOS */

diff --git a/src/h/rmacros.h b/src/h/rmacros.h
@@ -824,9 +824,9 @@
       Deliberate Syntax Error
    #endif				/* PORT */
 
-   #if MACINTOSH || MVS || UNIX || VM || VMS
+   #if MVS || UNIX || VM || VMS
       #define PushAVal(x) PushVal(x)
-   #endif				/* MACINTOSH ... */
+   #endif				/* MVS ... VMS */
 
    #if MSDOS
          #define PushAVal(x)  {sp++; \

diff --git a/src/h/sys.h b/src/h/sys.h
@@ -36,18 +36,6 @@
    Deliberate Syntax Error
 #endif					/* PORT */
 
-#if MACINTOSH
-   #ifdef MacGraph
-      #include <console.h>
-      #include <AppleEvents.h>
-      #include <GestaltEqu.h>
-      #include <fp.h>
-      #include <QDOffscreen.h>
-      #include <Palettes.h>
-      #include <Quickdraw.h>
-   #endif				/* MacGraph */
-#endif					/* MACINTOSH */
-
 #ifdef ISQL
   #undef Type
   #undef Precision

diff --git a/src/iconc/ccomp.c b/src/iconc/ccomp.c
@@ -32,7 +32,7 @@ Deliberate Syntax Error
 #endif
 #endif
 
-#if UNIX || MACINTOSH || MVS || VM
+#if UNIX || MVS || VM
 #define ExeFlag "-o"
 #define LinkLibs " -lm"
 #endif						/* UNIX ... */
@@ -79,7 +79,7 @@ char *libname;
 Deliberate Syntax Error
 #endif						/* PORT */
 
-#if UNIX || MACINTOSH || MSDOS || MVS || VM
+#if UNIX || MSDOS || MVS || VM
    l->libname = libname;
    l->nm_sz = strlen(libname);
 #endif						/* UNIX ... */
@@ -123,7 +123,7 @@ rmv_ccomp_opts(opts)
    char * q;
    char * rslt;
 
-#if PORT || MACINTOSH || MSDOS || MVS || VM || VMS
+#if PORT || MSDOS || MVS || VM || VMS
    /* something may be needed */
    fprintf(stderr, "warning: option \"-nO\" unsupported on this platform.\n");
    return opts;
@@ -214,7 +214,7 @@ char *exename;
  *  time as the number of libraries grew, it became a maintenance problem.
  */
 
-#if PORT || MACINTOSH || MVS || VM
+#if PORT || MVS || VM
    /* something may be needed */
 Deliberate Syntax Error
 #endif						/* PORT || ... */

diff --git a/src/iconc/cmain.c b/src/iconc/cmain.c
@@ -467,11 +467,11 @@ Deliberate Syntax Error
          addlib(argv[optind]);		/* assume linker option */
 #endif					/* UNIX ... */
 
-#if MACINTOSH || MSDOS || MVS || VM || VMS
+#if MSDOS || MVS || VM || VMS
       /*
        * Linker options on command line not supported.
        */
-#endif					/* MACINTOSH || ... */
+#endif					/* MSDOS || ... */
 
 /*
  * End of operating-system specific code.
@@ -511,12 +511,12 @@ Deliberate Syntax Error
             addlib(argv[optind]);
 #endif					/* UNIX ... */
 
-#if MACINTOSH || MSDOS || MVS || VM || VMS
+#if MSDOS || MVS || VM || VMS
             /*
              * Pass no files to the linker.
              */
             quitf("bad argument %s",argv[optind]);
-#endif					/* MACINTOSH || ... */
+#endif					/* MSDOS || ... */
 
 /*
  * End of operating-system specific code.
@@ -704,10 +704,6 @@ char *ofile, *efile, **args;
 Deliberate Syntax Error
 #endif					/* PORT */
 
-#if MACINTOSH
-      fprintf(stderr,"-x not supported\n"); fflush(stderr);
-#endif					/* MACINTOSH */
-
 #if MSDOS
 #if MICROSOFT || TURBO
       execvp(ofile,argv);

diff --git a/src/icont/link.c b/src/icont/link.c
@@ -33,9 +33,9 @@ void	setexe	(char *fname);
    Deliberate Syntax Error
 #endif					/* PORT */
 
-#if MACINTOSH || VM || VMS
+#if VM || VMS
    /* nothing to do */
-#endif					/* MACINTOSH || ... */
+#endif					/* VM || VMS */
 
 #if MSDOS
    extern char pathToIconDOS[];
@@ -199,9 +199,9 @@ char *outname;
    Deliberate Syntax Error
 #endif					/* PORT */
 
-#if MACINTOSH || MVS || UNIX || VM || VMS
+#if MVS || UNIX || VM || VMS
    /* nothing to do */
-#endif					/* MACINTOSH || ... */
+#endif					/* MVS || ... */
 
 #if MSDOS
    #if MICROSOFT || TURBO

diff --git a/src/icont/tmain.c b/src/icont/tmain.c
@@ -805,11 +805,6 @@ char *ofile, *efile, **args;
 Deliberate Syntax Error
 #endif					/* PORT */
 
-#if MACINTOSH
-      fprintf(stderr,"-x not supported\n");
-      fflush(stderr);
-#endif					/* MACINTOSH */
-
 #if MSDOS
       /* No special handling is needed for an .exe files, since iconx
        * recognizes it from the extension andfrom internal .exe data.

diff --git a/src/preproc/files.c b/src/preproc/files.c
@@ -18,13 +18,6 @@ Deliberate Syntax Error
 Deliberate Syntax Error
 #endif					/* VM || MVS */
 
-#if MACINTOSH
-char *FileNameMacToUnix(char *fn);
-char *FileNameUnixToMac(char *fn);
-char *FileNameMacConvert(char *(*func)(char *),char *fn);
-#define IsRelPath(fname) (fname[0] != '/')
-#endif					/* MACINTOSH */
-
 #if MSDOS
 #if MICROSOFT
    /* nothing is needed */
@@ -80,10 +73,6 @@ Deliberate Syntax Error
 Deliberate Syntax Error
 #endif					/* VM || MVS */
 
-#if MACINTOSH
-   fname = FileNameMacConvert(FileNameMacToUnix,fname);
-#endif					/* MACINTOSH */
-
 #if MSDOS
    char *s;
 
@@ -170,25 +159,11 @@ int system;
                      if (*s == '/')
                         end_prfx = s;
                   if (end_prfx != NULL) 
-#if MACINTOSH
-		     /*
-		      * For Mac-style names, don't include the file
-		      * separator character in the prefix.
-		      */
-                     for (s = cs->fname; s < end_prfx; ++s)
-#else					/* MACINTOSH */
-                     for (s = cs->fname; s <= end_prfx; ++s)
-#endif					/* MACINTOSH */
-                        AppChar(*sbuf, *s);
+                  for (s = cs->fname; s <= end_prfx; ++s)
+                     AppChar(*sbuf, *s);
                   for (s = fname; *s != '\0'; ++s)
                      AppChar(*sbuf, *s);
                   path = str_install(sbuf);
-#if MACINTOSH
-		  /*
-		   * Convert UNIX-style path to Mac-style.
-		   */
-		  path = FileNameMacConvert(FileNameUnixToMac,path);
-#endif					/* MACINTOSH */
                   f = fopen(path, "r");
                   }
                }
@@ -207,12 +182,6 @@ int system;
          for (s = fname; *s != '\0'; ++s)
             AppChar(*sbuf, *s);
          path = str_install(sbuf);
-#if MACINTOSH
-	 /*
-	  * Convert UNIX-style path to Mac-style.
-	  */
-	 path = FileNameMacConvert(FileNameUnixToMac,path);
-#endif					/* MACINTOSH */
          f = fopen(path, "r");
          ++prefix;
          }
@@ -300,10 +269,10 @@ Deliberate Syntax Error
       }
 #endif					/* VMS */
 
-#if VM || MVS || MACINTOSH
+#if VM || MVS
    /* probably needs something */
 Deliberate Syntax Error
-#endif					/* VM || MVS || ... */
+#endif					/* VM || MVS */
 
 #if MSDOS
 
@@ -458,9 +427,9 @@ Deliberate Syntax Error
 
 #endif					/* MSDOS */
 
-#if UNIX || VMS || MACINTOSH
+#if UNIX || VMS
    /* nothing is needed */
-#endif					/* UNIX || VMS || MACINTOSH */
+#endif					/* UNIX || VMS */
 
 /*
  * End of operating-system specific code.
@@ -492,10 +461,6 @@ Deliberate Syntax Error
 Deliberate Syntax Error
 #endif					/* VM || MVS */
 
-#if MACINTOSH
-   s1 = FileNameMacConvert(FileNameMacToUnix,s);
-#endif					/* MACINTOSH */
-
 #if MSDOS
          /*
           * Convert back slashes to slashes for internal consistency.
@@ -589,9 +554,9 @@ Deliberate Syntax Error
 
 #endif					/* MSDOS */
 
-#if UNIX || MACINTOSH
+#if UNIX
    incl_search[n_paths - 1] = sysdir;
-#endif					/* UNIX || MACINTOSH */
+#endif					/* UNIX */
 
 /*
  * End of operating-system specific code.

diff --git a/src/preproc/pinit.c b/src/preproc/pinit.c
@@ -16,10 +16,6 @@
 Deliberate Syntax Error
 #endif					/* PORT */
 
-#if MACINTOSH
-   /* nothing is needed */
-#endif					/* MACINTOSH */
-
 #if MSDOS
 #if MICROSOFT
    /* nothing is needed */
@@ -98,10 +94,6 @@ char **opt_args;
 Deliberate Syntax Error
 #endif					/* PORT */
 
-#if MACINTOSH
-   /* nothing is needed */
-#endif					/* MACINTOSH */
-
 #if MSDOS
 #if MICROSOFT
    char *undef_model = "#undef M_I86SM\n#undef M_I86CM\n#undef M_I86MM\n"
@@ -372,10 +364,6 @@ Deliberate Syntax Error
 Deliberate Syntax Error
 #endif					/* PORT */
 
-#if MACINTOSH
-   /* nothing is needed */
-#endif					/* MACINTOSH */
-
 #if MSDOS
 #if MICROSOFT
          case 'A':

diff --git a/src/preproc/pmain.c b/src/preproc/pmain.c
@@ -16,14 +16,6 @@ static char *options =
 Deliberate Syntax Error
 #endif					/* PORT */
 
-#if MACINTOSH
-static char *ostr = "CPD:I:U:o:";
-static char *options = 
-   "[-C] [-P] [-Dname[=[text]]] [-Uname] [-Ipath] [-ofile] [files]";
-   /* may need more options */
-Deliberate Syntax Error
-#endif					/* MACINTOSH */
-
 #if MSDOS
 #if MICROSOFT
    /* this really isn't right for anything but Microsoft */
@@ -119,11 +111,6 @@ char **argv;
 Deliberate Syntax Error
 #endif					/* PORT */
 
-#if MACINTOSH
-   /* may need something */
-Deliberate Syntax Error
-#endif					/* MACINTOSH */
-
 #if MSDOS
 #if MICROSOFT
          case 'A':