Skip to content

Commit 3047862

Browse files
JafaralJafaral
authored
Merge pull request uniconproject#377 from Don-Ward/Remove-MACINTOSH
Remove MACINTOSH configuration.
2 parents d6e816c + 12976e8 commit 3047862

24 files changed

+44
-182
lines changed

‎doc/book/langref.tex

-1
Original file line numberDiff line numberDiff line change
@@ -4769,7 +4769,6 @@ \subsection*{Predefined symbols}
47694769

47704770
\_V9\ \ \ \ \ \ \ \ \ \ Version 9\\
47714771
\_CMS\ \ \ \ \ \ \ \ \ \ CMS\\
4772-
\_MACINTOSH\ \ \ \ \ \ Macintosh\\
47734772
\_MSDOS\_386\ \ \ \ \ \ MS-DOS/386\\
47744773
\_MS\_WINDOWS\_NT\ \ \ \ MS Windows NT\\
47754774
\_MSDOS\ \ \ \ \ \ \ \ MS-DOS\\

‎doc/ib/appH.tex

+1-1
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ \chapter{Glossary of Defined Symbols}
273273
M\_PI & IU & constant value of Pi \\
274274
MacGraph & U & build graphics using (legacy pre OSX) Mac graphics (should delete) \\
275275
MACGRAPH\_H & IU & macgraph.h has been included \\
276-
MACINTOSH & all & build on legacy Mac platform (delete?) \\
276+
{\gr MACINTOSH} & {\gr all} & {\gr build on legacy Mac platform (delete?)} \\
277277
MacOS & U & build on modern UNIX-based Mac platform \\
278278
max & all & compute maximum of x and y \\
279279
MaxAbrSize & all & maximum allocated block region size \\

‎src/common/dconsole.c

+1-3
Original file line numberDiff line numberDiff line change
@@ -1045,9 +1045,7 @@ int i;
10451045
pollevent();
10461046
}
10471047

1048-
#if !MACINTOSH
1049-
#undef exit
1050-
#endif /* MACINTOSH */
1048+
#undef exit
10511049
exit(i);
10521050
}
10531051

‎src/common/filepart.c

-5
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,6 @@ static char *tryfile (char *buf, char *dir, char *name, char *extn);
3030
#define FileSep '/'
3131
#endif /* MSDOS */
3232

33-
#if MACINTOSH
34-
#define Prefix ":"
35-
#define FileSep ':'
36-
#endif /* MACINTOSH */
37-
3833
#if MVS
3934
#define Prefix ""
4035
#define FileSep '('

‎src/h/config.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -210,10 +210,6 @@
210210
#define PORT 0
211211
#endif /* PORT */
212212

213-
#ifndef MACINTOSH
214-
#define MACINTOSH 0
215-
#endif /* MACINTOSH */
216-
217213
#ifndef MSDOS
218214
#define MSDOS 0
219215
#endif /* MSDOS */
@@ -1026,3 +1022,7 @@ Deliberate Syntax Error
10261022
#if defined(CRAY) || defined (CRAY_STACK)
10271023
#error The CRAY configuration option is no longer supported (since 7 Mar 2024)
10281024
#endif /* CRAY */
1025+
1026+
#if defined(MACINTOSH)
1027+
#error The MACINTOSH configuration option is no longer supported (since 7 Mar 2024)
1028+
#endif /* MACINTOSH */

‎src/h/feature.h

-4
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,6 @@
2222
Feature(1, "_CMS", "CMS")
2323
#endif /* VM */
2424

25-
#if MACINTOSH
26-
Feature(1, "_MACINTOSH", "Macintosh")
27-
#endif /* MACINTOSH */
28-
2925
#ifdef MacOS
3026
Feature(1, "_MACOS", "MacOS")
3127
#endif /* MacOS */

‎src/h/rmacros.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -824,9 +824,9 @@
824824
Deliberate Syntax Error
825825
#endif /* PORT */
826826

827-
#if MACINTOSH || MVS || UNIX || VM || VMS
827+
#if MVS || UNIX || VM || VMS
828828
#define PushAVal(x) PushVal(x)
829-
#endif /* MACINTOSH ... */
829+
#endif /* MVS ... VMS */
830830

831831
#if MSDOS
832832
#define PushAVal(x) {sp++; \

‎src/h/sys.h

-12
Original file line numberDiff line numberDiff line change
@@ -36,18 +36,6 @@
3636
Deliberate Syntax Error
3737
#endif /* PORT */
3838

39-
#if MACINTOSH
40-
#ifdef MacGraph
41-
#include <console.h>
42-
#include <AppleEvents.h>
43-
#include <GestaltEqu.h>
44-
#include <fp.h>
45-
#include <QDOffscreen.h>
46-
#include <Palettes.h>
47-
#include <Quickdraw.h>
48-
#endif /* MacGraph */
49-
#endif /* MACINTOSH */
50-
5139
#ifdef ISQL
5240
#undef Type
5341
#undef Precision

‎src/iconc/ccomp.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Deliberate Syntax Error
3232
#endif
3333
#endif
3434

35-
#if UNIX || MACINTOSH || MVS || VM
35+
#if UNIX || MVS || VM
3636
#define ExeFlag "-o"
3737
#define LinkLibs " -lm"
3838
#endif /* UNIX ... */
@@ -79,7 +79,7 @@ char *libname;
7979
Deliberate Syntax Error
8080
#endif /* PORT */
8181

82-
#if UNIX || MACINTOSH || MSDOS || MVS || VM
82+
#if UNIX || MSDOS || MVS || VM
8383
l->libname = libname;
8484
l->nm_sz = strlen(libname);
8585
#endif /* UNIX ... */
@@ -123,7 +123,7 @@ rmv_ccomp_opts(opts)
123123
char * q;
124124
char * rslt;
125125

126-
#if PORT || MACINTOSH || MSDOS || MVS || VM || VMS
126+
#if PORT || MSDOS || MVS || VM || VMS
127127
/* something may be needed */
128128
fprintf(stderr, "warning: option \"-nO\" unsupported on this platform.\n");
129129
return opts;
@@ -214,7 +214,7 @@ char *exename;
214214
* time as the number of libraries grew, it became a maintenance problem.
215215
*/
216216

217-
#if PORT || MACINTOSH || MVS || VM
217+
#if PORT || MVS || VM
218218
/* something may be needed */
219219
Deliberate Syntax Error
220220
#endif /* PORT || ... */

‎src/iconc/cmain.c

+4-8
Original file line numberDiff line numberDiff line change
@@ -467,11 +467,11 @@ Deliberate Syntax Error
467467
addlib(argv[optind]); /* assume linker option */
468468
#endif /* UNIX ... */
469469

470-
#if MACINTOSH || MSDOS || MVS || VM || VMS
470+
#if MSDOS || MVS || VM || VMS
471471
/*
472472
* Linker options on command line not supported.
473473
*/
474-
#endif /* MACINTOSH || ... */
474+
#endif /* MSDOS || ... */
475475

476476
/*
477477
* End of operating-system specific code.
@@ -511,12 +511,12 @@ Deliberate Syntax Error
511511
addlib(argv[optind]);
512512
#endif /* UNIX ... */
513513

514-
#if MACINTOSH || MSDOS || MVS || VM || VMS
514+
#if MSDOS || MVS || VM || VMS
515515
/*
516516
* Pass no files to the linker.
517517
*/
518518
quitf("bad argument %s",argv[optind]);
519-
#endif /* MACINTOSH || ... */
519+
#endif /* MSDOS || ... */
520520

521521
/*
522522
* End of operating-system specific code.
@@ -704,10 +704,6 @@ char *ofile, *efile, **args;
704704
Deliberate Syntax Error
705705
#endif /* PORT */
706706

707-
#if MACINTOSH
708-
fprintf(stderr,"-x not supported\n"); fflush(stderr);
709-
#endif /* MACINTOSH */
710-
711707
#if MSDOS
712708
#if MICROSOFT || TURBO
713709
execvp(ofile,argv);

‎src/icont/link.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ void setexe (char *fname);
3333
Deliberate Syntax Error
3434
#endif /* PORT */
3535

36-
#if MACINTOSH || VM || VMS
36+
#if VM || VMS
3737
/* nothing to do */
38-
#endif /* MACINTOSH || ... */
38+
#endif /* VM || VMS */
3939

4040
#if MSDOS
4141
extern char pathToIconDOS[];
@@ -199,9 +199,9 @@ char *outname;
199199
Deliberate Syntax Error
200200
#endif /* PORT */
201201

202-
#if MACINTOSH || MVS || UNIX || VM || VMS
202+
#if MVS || UNIX || VM || VMS
203203
/* nothing to do */
204-
#endif /* MACINTOSH || ... */
204+
#endif /* MVS || ... */
205205

206206
#if MSDOS
207207
#if MICROSOFT || TURBO

‎src/icont/tmain.c

-5
Original file line numberDiff line numberDiff line change
@@ -805,11 +805,6 @@ char *ofile, *efile, **args;
805805
Deliberate Syntax Error
806806
#endif /* PORT */
807807

808-
#if MACINTOSH
809-
fprintf(stderr,"-x not supported\n");
810-
fflush(stderr);
811-
#endif /* MACINTOSH */
812-
813808
#if MSDOS
814809
/* No special handling is needed for an .exe files, since iconx
815810
* recognizes it from the extension andfrom internal .exe data.

‎src/preproc/files.c

+8-43
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,6 @@ Deliberate Syntax Error
1818
Deliberate Syntax Error
1919
#endif /* VM || MVS */
2020

21-
#if MACINTOSH
22-
char *FileNameMacToUnix(char *fn);
23-
char *FileNameUnixToMac(char *fn);
24-
char *FileNameMacConvert(char *(*func)(char *),char *fn);
25-
#define IsRelPath(fname) (fname[0] != '/')
26-
#endif /* MACINTOSH */
27-
2821
#if MSDOS
2922
#if MICROSOFT
3023
/* nothing is needed */
@@ -80,10 +73,6 @@ Deliberate Syntax Error
8073
Deliberate Syntax Error
8174
#endif /* VM || MVS */
8275

83-
#if MACINTOSH
84-
fname = FileNameMacConvert(FileNameMacToUnix,fname);
85-
#endif /* MACINTOSH */
86-
8776
#if MSDOS
8877
char *s;
8978

@@ -170,25 +159,11 @@ int system;
170159
if (*s == '/')
171160
end_prfx = s;
172161
if (end_prfx != NULL)
173-
#if MACINTOSH
174-
/*
175-
* For Mac-style names, don't include the file
176-
* separator character in the prefix.
177-
*/
178-
for (s = cs->fname; s < end_prfx; ++s)
179-
#else /* MACINTOSH */
180-
for (s = cs->fname; s <= end_prfx; ++s)
181-
#endif /* MACINTOSH */
182-
AppChar(*sbuf, *s);
162+
for (s = cs->fname; s <= end_prfx; ++s)
163+
AppChar(*sbuf, *s);
183164
for (s = fname; *s != '\0'; ++s)
184165
AppChar(*sbuf, *s);
185166
path = str_install(sbuf);
186-
#if MACINTOSH
187-
/*
188-
* Convert UNIX-style path to Mac-style.
189-
*/
190-
path = FileNameMacConvert(FileNameUnixToMac,path);
191-
#endif /* MACINTOSH */
192167
f = fopen(path, "r");
193168
}
194169
}
@@ -207,12 +182,6 @@ int system;
207182
for (s = fname; *s != '\0'; ++s)
208183
AppChar(*sbuf, *s);
209184
path = str_install(sbuf);
210-
#if MACINTOSH
211-
/*
212-
* Convert UNIX-style path to Mac-style.
213-
*/
214-
path = FileNameMacConvert(FileNameUnixToMac,path);
215-
#endif /* MACINTOSH */
216185
f = fopen(path, "r");
217186
++prefix;
218187
}
@@ -300,10 +269,10 @@ Deliberate Syntax Error
300269
}
301270
#endif /* VMS */
302271

303-
#if VM || MVS || MACINTOSH
272+
#if VM || MVS
304273
/* probably needs something */
305274
Deliberate Syntax Error
306-
#endif /* VM || MVS || ... */
275+
#endif /* VM || MVS */
307276

308277
#if MSDOS
309278

@@ -458,9 +427,9 @@ Deliberate Syntax Error
458427

459428
#endif /* MSDOS */
460429

461-
#if UNIX || VMS || MACINTOSH
430+
#if UNIX || VMS
462431
/* nothing is needed */
463-
#endif /* UNIX || VMS || MACINTOSH */
432+
#endif /* UNIX || VMS */
464433

465434
/*
466435
* End of operating-system specific code.
@@ -492,10 +461,6 @@ Deliberate Syntax Error
492461
Deliberate Syntax Error
493462
#endif /* VM || MVS */
494463

495-
#if MACINTOSH
496-
s1 = FileNameMacConvert(FileNameMacToUnix,s);
497-
#endif /* MACINTOSH */
498-
499464
#if MSDOS
500465
/*
501466
* Convert back slashes to slashes for internal consistency.
@@ -589,9 +554,9 @@ Deliberate Syntax Error
589554

590555
#endif /* MSDOS */
591556

592-
#if UNIX || MACINTOSH
557+
#if UNIX
593558
incl_search[n_paths - 1] = sysdir;
594-
#endif /* UNIX || MACINTOSH */
559+
#endif /* UNIX */
595560

596561
/*
597562
* End of operating-system specific code.

‎src/preproc/pinit.c

-12
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,6 @@
1616
Deliberate Syntax Error
1717
#endif /* PORT */
1818

19-
#if MACINTOSH
20-
/* nothing is needed */
21-
#endif /* MACINTOSH */
22-
2319
#if MSDOS
2420
#if MICROSOFT
2521
/* nothing is needed */
@@ -98,10 +94,6 @@ char **opt_args;
9894
Deliberate Syntax Error
9995
#endif /* PORT */
10096

101-
#if MACINTOSH
102-
/* nothing is needed */
103-
#endif /* MACINTOSH */
104-
10597
#if MSDOS
10698
#if MICROSOFT
10799
char *undef_model = "#undef M_I86SM\n#undef M_I86CM\n#undef M_I86MM\n"
@@ -372,10 +364,6 @@ Deliberate Syntax Error
372364
Deliberate Syntax Error
373365
#endif /* PORT */
374366

375-
#if MACINTOSH
376-
/* nothing is needed */
377-
#endif /* MACINTOSH */
378-
379367
#if MSDOS
380368
#if MICROSOFT
381369
case 'A':

‎src/preproc/pmain.c

-13
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,6 @@ static char *options =
1616
Deliberate Syntax Error
1717
#endif /* PORT */
1818

19-
#if MACINTOSH
20-
static char *ostr = "CPD:I:U:o:";
21-
static char *options =
22-
"[-C] [-P] [-Dname[=[text]]] [-Uname] [-Ipath] [-ofile] [files]";
23-
/* may need more options */
24-
Deliberate Syntax Error
25-
#endif /* MACINTOSH */
26-
2719
#if MSDOS
2820
#if MICROSOFT
2921
/* this really isn't right for anything but Microsoft */
@@ -119,11 +111,6 @@ char **argv;
119111
Deliberate Syntax Error
120112
#endif /* PORT */
121113

122-
#if MACINTOSH
123-
/* may need something */
124-
Deliberate Syntax Error
125-
#endif /* MACINTOSH */
126-
127114
#if MSDOS
128115
#if MICROSOFT
129116
case 'A':

0 commit comments

Comments
 (0)