Skip to content

Commit e37778c

Browse files
committed
Remove all #ifdef MACOS_TRADITIONAL code in core and non-dual-life XS code.
(MacOS support was removed from MakeMaker in 6.22, and merged to blead on 15th December 2004 with 5dca256. After this point MacOS wouldn't even have been able to build the perl binary, because it would not have been able to build DynaLoader. If anyone wishes to resurrect MacOS, start by reversing this commit and the relevant part of that commit.)
1 parent f210009 commit e37778c

File tree

14 files changed

+43
-661
lines changed

14 files changed

+43
-661
lines changed

cop.h

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -232,11 +232,7 @@ struct cop {
232232
#define CopLINE_set(c,l) (CopLINE(c) = (l))
233233

234234
/* OutCopFILE() is CopFILE for output (caller, die, warn, etc.) */
235-
#ifdef MACOS_TRADITIONAL
236-
# define OutCopFILE(c) MacPerl_MPWFileName(CopFILE(c))
237-
#else
238-
# define OutCopFILE(c) CopFILE(c)
239-
#endif
235+
#define OutCopFILE(c) CopFILE(c)
240236

241237
/* If $[ is non-zero, it's stored in cop_hints under the key "$[", and
242238
HINT_ARYBASE is set to indicate this.

doio.c

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1395,7 +1395,7 @@ Perl_do_aexec5(pTHX_ SV *really, register SV **mark, register SV **sp,
13951395
{
13961396
dVAR;
13971397
PERL_ARGS_ASSERT_DO_AEXEC5;
1398-
#if defined(MACOS_TRADITIONAL) || defined(__SYMBIAN32__) || defined(__LIBCATAMOUNT__)
1398+
#if defined(__SYMBIAN32__) || defined(__LIBCATAMOUNT__)
13991399
Perl_croak(aTHX_ "exec? I'm not *that* kind of operating system");
14001400
#else
14011401
if (sp > mark) {
@@ -1943,10 +1943,6 @@ Perl_cando(pTHX_ Mode_t mode, bool effective, register const Stat_t *statbufp)
19431943
static bool
19441944
S_ingroup(pTHX_ Gid_t testgid, bool effective)
19451945
{
1946-
#ifdef MACOS_TRADITIONAL
1947-
/* This is simply not correct for AppleShare, but fix it yerself. */
1948-
return TRUE;
1949-
#else
19501946
dVAR;
19511947
if (testgid == (effective ? PL_egid : PL_gid))
19521948
return TRUE;
@@ -1971,7 +1967,6 @@ S_ingroup(pTHX_ Gid_t testgid, bool effective)
19711967
#else
19721968
return FALSE;
19731969
#endif
1974-
#endif
19751970
}
19761971

19771972
#if defined(HAS_MSG) || defined(HAS_SEM) || defined(HAS_SHM)
@@ -2352,11 +2347,6 @@ Perl_vms_start_glob
23522347
fp = Perl_vms_start_glob(aTHX_ tmpglob, io);
23532348

23542349
#else /* !VMS */
2355-
#ifdef MACOS_TRADITIONAL
2356-
sv_setpv(tmpcmd, "glob ");
2357-
sv_catsv(tmpcmd, tmpglob);
2358-
sv_catpv(tmpcmd, " |");
2359-
#else
23602350
#ifdef DOSISH
23612351
#ifdef OS2
23622352
sv_setpv(tmpcmd, "for a in ");
@@ -2388,7 +2378,6 @@ Perl_vms_start_glob
23882378
#endif
23892379
#endif /* !CSH */
23902380
#endif /* !DOSISH */
2391-
#endif /* MACOS_TRADITIONAL */
23922381
(void)do_open(PL_last_in_gv, (char*)SvPVX_const(tmpcmd), SvCUR(tmpcmd),
23932382
FALSE, O_RDONLY, 0, NULL);
23942383
fp = IoIFP(io);

doop.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -203,10 +203,6 @@ S_do_trans_complex(pTHX_ SV * const sv)
203203
if (complement && !del)
204204
rlen = tbl[0x100];
205205

206-
#ifdef MACOS_TRADITIONAL
207-
#define comp CoMP /* "comp" is a keyword in some compilers ... */
208-
#endif
209-
210206
if (PL_op->op_private & OPpTRANS_SQUASH) {
211207
UV pch = 0xfeedface;
212208
while (s < send) {

0 commit comments

Comments
 (0)